Merge pull request #244 from sheepishgoat/docility-implant

Docility Implants and Supply teleports

code/__DEFINES/traits.dm

@@ -227,6 +227,8 @@
 #define TRAIT_NO_MISC "no_misc"
 #define TRAIT_NO_BACKPACK "no_backpack"
 #define TRAIT_NO_BUCKLE "no_buckle"
+#define TRAIT_DOCILE "docile"
+#define TRAIT_LIVESTOCK "livestock"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"

code/game/machinery/quantum_pad.dm

@@ -162,6 +162,9 @@
 				if(QDELETED(ROI))
 					continue //sleeps in CHECK_TICK
 
+				if(isliving(ROI) && !check_mob_teleportability(ROI))
+					continue
+
 				// if is anchored, don't let through
 				if(ROI.anchored)
 					if(isliving(ROI))
@@ -184,6 +187,10 @@
 		linked_pad = link
 		. = TRUE
 
+/// Checks if the mob is able to be teleported.
+/obj/machinery/quantumpad/proc/check_mob_teleportability(mob/living/mob_to_check)
+	return TRUE
+
 /obj/item/paper/guides/quantumpad
 	name = "Quantum Pad For Dummies"
 	info = "<center><b>Dummies Guide To Quantum Pads</b></center><br><br><center>Do you hate the concept of having to use your legs, let alone <i>walk</i> to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!<br><br><c><b>How to set up your Quantum Pad(tm)</b></center><br><br>1.Unscrew the Quantum Pad(tm) you wish to link.<br>2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.<br>3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)<br><br><center>If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.</center>"

code/modules/client/preferences.dm

@@ -1070,6 +1070,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "<h2>GS13 Gameplay Preferences</h2>"
 			dat += "<b>Stuckage (weight results in getting stuck in doors):</b><a href='?_src_=prefs;preference=stuckage'>[stuckage == TRUE ? "Enabled" : "Disabled"]</a><BR>"
+			dat += "This preference will allow items that work based on weight to work to you, <b>usually to your detriment.</b> <BR>"
+			dat += "<b>Fatness Vulnerability:</b><a href='?_src_=prefs;preference=fatness_vulnerable'>[fatness_vulnerable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
+			dat += "This preference functions similar to the one before but allows for items with more drastic effects. <b>Do not enable this if you aren't okay with more drastic things happening to your character.</b><BR>"
+			dat += "<b>Extreme Fatness Vulnerability:</b><a href='?_src_=prefs;preference=extreme_fatness_vulnerable'>[extreme_fatness_vulnerable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 			dat += "<b>Extreme Weight Gain (Sprite Size scales with weight):</b><a href='?_src_=prefs;preference=weight_gain_extreme'>[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 
 			dat += "<h2>GS13 Helplessness Preferences</h2>"
@@ -2666,6 +2670,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					bot_feeding = !bot_feeding
 				if("stuckage")
 					stuckage = !stuckage
+				if("fatness_vulnerable")
+					fatness_vulnerable = !fatness_vulnerable
+				if("extreme_fatness_vulnerable")
+					extreme_fatness_vulnerable = !extreme_fatness_vulnerable
 				if("blueberry_inflation")
 					blueberry_inflation = !blueberry_inflation
 				if("max_fatness")

code/modules/client/preferences_savefile.dm

@@ -171,6 +171,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["helplessness_clothing_back"] >> helplessness_clothing_back
 	S["helplessness_no_buckle"] >> helplessness_no_buckle
 	S["stuckage"] >> stuckage
+	S["fatness_vulnerable"] >> fatness_vulnerable 
+	S["extreme_fatness_vulnerable"] >> extreme_fatness_vulnerable
 	S["blueberry_inflation"] >> blueberry_inflation
 
 
@@ -325,6 +327,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back)
 	WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle)
 	WRITE_FILE(S["stuckage"], stuckage)
+	WRITE_FILE(S["fatness_vulnerable"], fatness_vulnerable)
+	WRITE_FILE(S["extreme_fatness_vulnerable"], extreme_fatness_vulnerable)
 	WRITE_FILE(S["blueberry_inflation"], blueberry_inflation)
 	return 1