cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofChemistryAndStuff

Browse Source 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-05-15 11:28:05 +03:00
parent fedd0342a0 876b5ee94d
commit 10915eae24
468 changed files with 7273 additions and 9076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/setup.dm
+17 -1
View File
@@ -267,7 +267,7 @@
#define slot_legs 21
#define slot_tie 22
// Inventory slot strings.
// Inventory slot strings.
// since numbers cannot be used as associative list keys.
#define slot_back_str "back"
#define slot_l_hand_str "slot_l_hand"
@@ -956,3 +956,19 @@ var/list/be_special_flags = list(
#define LANGUAGE_ROOTSPEAK "Rootspeak"
#define LANGUAGE_TRADEBAND "Tradeband"
#define LANGUAGE_GUTTER "Gutter"
#define WALL_CAN_OPEN 1
#define WALL_OPENING 2
#define CLAMP01(x) max(0, min(1, x))
#define DEFAULT_WALL_MATERIAL "steel"
// Convoluted setup so defines can be supplied by Bay12 main server compile script.
// Should still work fine for people jamming the icons into their repo.
#ifndef CUSTOM_ITEM_OBJ
#define CUSTOM_ITEM_OBJ 'icons/obj/custom_items_obj.dmi'
#endif
#ifndef CUSTOM_ITEM_MOB
#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi'
#endif