mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
Merge branch 'master' into final_away_maps_additions
# Conflicts: # code/__defines/misc.dm # code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm # icons/mob/head.dmi # maps/exodus/code/exodus.dm
This commit is contained in:
@@ -1,7 +1,3 @@
|
||||
#define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE)
|
||||
#define TANK_DEFAULT_RELEASE_PRESSURE 24
|
||||
#define TANK_IDEAL_PRESSURE 1015 //Arbitrary.
|
||||
|
||||
/obj/item/tank
|
||||
name = "tank"
|
||||
icon = 'icons/obj/tank.dmi'
|
||||
|
||||
Reference in New Issue
Block a user