Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals

# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi

code/__DEFINES/clothing.dm

@@ -32,7 +32,8 @@
 #define slot_r_ear 20
 #define slot_wear_pda 21
 #define slot_tie 22
-#define slots_amt 22
+#define slot_collar 23
+#define slots_amt 23
 
 //Cant seem to find a mob bitflags area other than the powers one
 

code/__DEFINES/flags.dm

@@ -24,8 +24,8 @@
 #define BLOCK_GAS_SMOKE_EFFECT	8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
 #define THICKMATERIAL 			8192	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
 
-
-#define	NOREACT					16384 	//Reagents dont' react inside this container.
+//Reagent flags
+#define REAGENT_NOREACT			1
 
 //Species flags.
 

code/__DEFINES/hud.dm

@@ -47,3 +47,8 @@
 #define ANTAG_HUD_CHANGELING 15
 #define ANTAG_HUD_VAMPIRE 16
 #define ANTAG_HUD_ABDUCTOR 17 //For Fox
+
+// Notification action types
+#define NOTIFY_JUMP "jump"
+#define NOTIFY_ATTACK "attack"
+#define NOTIFY_FOLLOW "orbit"

code/__DEFINES/is_helpers.dm

@@ -1,8 +1,27 @@
+// Atoms
 #define isatom(A) istype(A, /atom)
 #define ismovableatom(A) istype(A, /atom/movable)
-#define isclient(A) istype(A, /client)
 
+// Mobs 
+#define ismegafauna(A) istype(A, /mob/living/simple_animal/hostile/megafauna)
+
+//Turfs
+#define issimulatedturf(A) istype(A, /turf/simulated)
+
+#define isspaceturf(A) istype(A, /turf/space)
+
+#define isfloorturf(A) istype(A, /turf/simulated/floor)
+
+#define isunsimulatedturf(A) istype(A, /turf/unsimulated)
+
+#define iswallturf(A) istype(A, /turf/simulated/wall)
+
+#define isreinforcedwallturf(A) istype(A, /turf/simulated/wall/r_wall)
+
+#define ismineralturf(A) istype(A, /turf/simulated/mineral)
+
+// Misc
+#define isclient(A) istype(A, /client)
 #define isradio(A) istype(A, /obj/item/device/radio)
 #define ispill(A) istype(A, /obj/item/weapon/reagent_containers/food/pill)
 
-#define isspaceturf(A) (istype(A, /turf/space))

code/__DEFINES/machines.dm

@@ -17,12 +17,13 @@
 
 #define MINERAL_MATERIAL_AMOUNT 2000 //The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
 
-#define	IMPRINTER	1	//For circuits. Uses glass/chemicals.
-#define PROTOLATHE	2	//New stuff. Uses glass/metal/chemicals
-#define	AUTOLATHE	4	//Uses glass/metal only.
-#define CRAFTLATHE	8	//Uses fuck if I know. For use eventually.
-#define MECHFAB		16 //Remember, objects utilising this flag should have construction_time and construction_cost vars.
-#define PODFAB		32 //Used by the spacepod part fabricator. Same idea as the mechfab
+#define	IMPRINTER		1	//For circuits. Uses glass/chemicals.
+#define PROTOLATHE		2	//New stuff. Uses glass/metal/chemicals
+#define	AUTOLATHE		4	//Uses glass/metal only.
+#define CRAFTLATHE		8	//Uses fuck if I know. For use eventually.
+#define MECHFAB			16 	//Remember, objects utilising this flag should have construction_time and construction_cost vars.
+#define PODFAB			32 	//Used by the spacepod part fabricator. Same idea as the mechfab
+#define BIOGENERATOR	64 	//Uses biomass
 //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
 
 #define HYDRO_SPEED_MULTIPLIER 1

code/__DEFINES/misc.dm

@@ -299,5 +299,19 @@
 // The cooldown on OOC messages such as OOC, LOOC, praying and adminhelps
 #define OOC_COOLDOWN 5
 
+
+// Medal names
+#define BOSS_KILL_MEDAL "Killer"
+#define ALL_KILL_MEDAL "Exterminator"	//Killing all of x type
+
+// Score names
+#define LEGION_SCORE "Legion Killed"
+#define COLOSSUS_SCORE "Colossus Killed"
+#define BUBBLEGUM_SCORE "Bubblegum Killed"
+#define DRAKE_SCORE "Drakes Killed"
+#define BIRD_SCORE "Hierophants Killed"
+#define BOSS_SCORE "Bosses Killed"
+#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
+
 // The number of station goals generated each round.
 #define STATION_GOAL_BUDGET 1

code/__DEFINES/qdel.dm

@@ -4,8 +4,7 @@
 #define QDEL_HINT_LETMELIVE		1 //qdel should let the object live after calling destory.
 #define QDEL_HINT_IWILLGC		2 //functionally the same as the above. qdel should assume the object will gc on its own, and not check it.
 #define QDEL_HINT_HARDDEL_NOW	4 //qdel should assume this object won't gc, and hard del it post haste.
-#define QDEL_HINT_PUTINPOOL		5 //qdel will put this object in the atom pool.
-#define QDEL_HINT_FINDREFERENCE	6 //functionally identical to QDEL_HINT_QUEUE if TESTING is not enabled in _compiler_options.dm.
+#define QDEL_HINT_FINDREFERENCE	5 //functionally identical to QDEL_HINT_QUEUE if TESTING is not enabled in _compiler_options.dm.
 								  //if TESTING is enabled, qdel will call this object's find_references() verb.
 
 // A convenient wrapper around checking for qdeletion/non-existence