merge from master

code/__DEFINES/DNA.dm

@@ -108,6 +108,8 @@
 #define TR_KEEPSE		(1<<5)	// changelings shouldn't edit the DNA's SE when turning into a monkey
 #define TR_DEFAULTMSG	(1<<6)
 #define TR_KEEPORGANS	(1<<8)
+#define TR_KEEPREAGENTS	(1<<10)
+#define TR_KEEPSTUNS	(1<<9)
 
 
 #define CLONER_FRESH_CLONE "fresh"
@@ -184,4 +186,4 @@
 #define G_MALE 1
 #define G_FEMALE 2
 #define G_PLURAL 3
-#define G_NEUTER 4
+#define G_NEUTER 4

code/__DEFINES/_flags/_flags.dm

@@ -142,6 +142,10 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 /// The attack is from a parry counterattack.
 #define ATTACKCHAIN_PARRY_COUNTERATTACK			(1<<0)
 
+// UnarmedAttack() flags
+/// Attack is from a parry counterattack
+#define UNARMED_ATTACK_PARRY					(1<<0)
+
 /// If the thing can reflect light (lasers/energy)
 #define RICOCHET_SHINY			(1<<0)
 /// If the thing can reflect matter (bullets/bomb shrapnel)

code/__DEFINES/admin.dm

@@ -74,6 +74,7 @@
 #define ADMIN_PUNISHMENT_MAZING "Puzzle"
 #define ADMIN_PUNISHMENT_PIE "Cream Pie"
 #define ADMIN_PUNISHMENT_CUSTOM_PIE "Custom Cream Pie"
+#define ADMIN_PUNISHMENT_PICKLE "Pickle-ify"
 
 #define AHELP_ACTIVE 1
 #define AHELP_CLOSED 2

code/__DEFINES/chemistry/reactions.dm

@@ -0,0 +1,4 @@
+// Reaction priorities, higher makes it checked first. Otherwise, it goes based on reaction temperature requirements.
+
+#define CHEMICAL_REACTION_PRIORITY_DEFAULT				100
+#define CHEMICAL_REACTION_PRIORITY_SMOKE				1000

code/__DEFINES/dcs/signals.dm

@@ -32,6 +32,8 @@
 #define COMSIG_ELEMENT_DETACH "element_detach"
 
 // /atom signals
+//from base of atom/proc/Initialize(): sent any time a new atom is created
+#define COMSIG_ATOM_CREATED "atom_created"
 #define COMSIG_PARENT_ATTACKBY "atom_attackby"			        //from base of atom/attackby(): (/obj/item, /mob/living, params)
 	#define COMPONENT_NO_AFTERATTACK 1								//Return this in response if you don't want afterattack to be called
 #define COMSIG_ATOM_HULK_ATTACK "hulk_attack"					//from base of atom/attack_hulk(): (/mob/living/carbon/human)

code/__DEFINES/logging.dm

@@ -38,6 +38,7 @@
 #define LOG_ADMIN_PRIVATE (1 << 14)
 #define LOG_ASAY		(1 << 15)
 #define LOG_VIRUS		(1 << 16)
+#define LOG_SHUTTLE		(1 << 18)
 
 //Individual logging panel pages
 #define INDIVIDUAL_ATTACK_LOG		(LOG_ATTACK)

code/__DEFINES/misc.dm

@@ -534,3 +534,5 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define LOOT_RESTRICTION_CKEY		2
 #define LOOT_RESTRICTION_MIND_PILE	3 //limited to the current pile.
 #define LOOT_RESTRICTION_CKEY_PILE	4 //Idem
+
+#define WANTED_FILE "wanted_message.json"

code/__DEFINES/rust_g.dm

@@ -6,7 +6,7 @@
 #define RUSTG_JOB_ERROR "JOB PANICKED"
 
 #define rustg_dmi_strip_metadata(fname) call(RUST_G, "dmi_strip_metadata")(fname)
-#define rustg_dmi_create_png(fname,width,height,data) call(RUST_G, "dmi_create_png")(fname,width,height,data)
+#define rustg_dmi_create_png(path, width, height, data) call(RUST_G, "dmi_create_png")(path, width, height, data)
 
 #define rustg_git_revparse(rev) call(RUST_G, "rg_git_revparse")(rev)
 #define rustg_git_commit_date(rev) call(RUST_G, "rg_git_commit_date")(rev)
@@ -14,14 +14,12 @@
 #define rustg_log_write(fname, text, format) call(RUST_G, "log_write")(fname, text, format)
 /proc/rustg_log_close_all() return call(RUST_G, "log_close_all")()
 
-// RUST-G defines & procs for HTTP component
 #define RUSTG_HTTP_METHOD_GET "get"
-#define RUSTG_HTTP_METHOD_POST "post"
 #define RUSTG_HTTP_METHOD_PUT "put"
 #define RUSTG_HTTP_METHOD_DELETE "delete"
 #define RUSTG_HTTP_METHOD_PATCH "patch"
 #define RUSTG_HTTP_METHOD_HEAD "head"
-
+#define RUSTG_HTTP_METHOD_POST "post"
 #define rustg_http_request_blocking(method, url, body, headers) call(RUST_G, "http_request_blocking")(method, url, body, headers)
 #define rustg_http_request_async(method, url, body, headers) call(RUST_G, "http_request_async")(method, url, body, headers)
 #define rustg_http_check_request(req_id) call(RUST_G, "http_check_request")(req_id)

code/__DEFINES/vv.dm

@@ -76,6 +76,13 @@
 #define VV_HK_ADDCOMPONENT "addcomponent"
 #define VV_HK_MODIFY_TRAITS "modtraits"
 
+// /datum/gas_mixture
+#define VV_HK_SET_MOLES "set_moles"
+#define VV_HK_EMPTY "empty"
+#define VV_HK_SET_TEMPERATURE "set_temp"
+#define VV_HK_PARSE_GASSTRING "parse_gasstring"
+#define VV_HK_SET_VOLUME "set_volume"
+
 // /atom
 #define VV_HK_MODIFY_TRANSFORM "atom_transform"
 #define VV_HK_ADD_REAGENT "addreagent"