Skip to content

Commit

Permalink
atmos and mob fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Djiq committed Oct 2, 2022
1 parent 349a9c2 commit 620ed01
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
//PLANETARY ATMOS MIXES
#define LAVALAND_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300"
#define ICEMOON_DEFAULT_ATMOS "o2=14;n2=23;TEMP=180"
#define JUNGLELAND_DEFAULT_ATMOS "o2=44;n2=164;TEMP=500" //yogs edit
#define JUNGLELAND_DEFAULT_ATMOS "o2=44;n2=164;TEMP=400" //yogs edit

//ATMOSIA GAS MONITOR TAGS
#define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/{yogs_defines}/atmospherics.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define NITROGEN_NARCOSIS_PRESSURE_LOW 160 // Low-level Nitrogen Narcosis, laughter and tunnel vision
#define NITROGEN_NARCOSIS_PRESSURE_HIGH 480 // High-level nitrogen narcosis, with hallucinations

#define JUNGLELAND_EQUIPMENT_EFFECT_PRESSURE 340
#define JUNGLELAND_EQUIPMENT_EFFECT_PRESSURE 200
4 changes: 2 additions & 2 deletions yogstation/code/modules/jungleland/jungle_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
maxHealth = 320
health = 320
maxHealth = 200
health = 200
spacewalk = TRUE
butcher_results = list(/obj/item/stack/sheet/slime = 1)
melee_damage_lower = 4
Expand Down

0 comments on commit 620ed01

Please sign in to comment.