Update to spacemandmm 1.4 (tgstation#128)

Dockerfile

@@ -1,4 +1,4 @@
-FROM tgstation/byond:513.1511 as base
+FROM tgstation/byond:513.1514 as base
 
 FROM base as build_base
 

code/__DEFINES/spaceman_dmm.dm

@@ -6,10 +6,26 @@
 	#define RETURN_TYPE(X) set SpacemanDMM_return_type = X
 	#define SHOULD_CALL_PARENT(X) set SpacemanDMM_should_call_parent = X
 	#define UNLINT(X) SpacemanDMM_unlint(X)
+	#define SHOULD_NOT_OVERRIDE(X) set SpacemanDMM_should_not_override = X
+	#define SHOULD_NOT_SLEEP(X) set SpacemanDMM_should_not_sleep = X
+	#define SHOULD_BE_PURE(X) set SpacemanDMM_should_be_pure = X
+	#define PRIVATE_PROC(X) set SpacemanDMM_private_proc = X
+	#define PROTECTED_PROC(X) set SpacemanDMM_protected_proc = X
+	#define VAR_FINAL var/SpacemanDMM_final
+	#define VAR_PRIVATE var/SpacemanDMM_private
+	#define VAR_PROTECTED var/SpacemanDMM_protected
 #else
 	#define RETURN_TYPE(X)
 	#define SHOULD_CALL_PARENT(X)
 	#define UNLINT(X) X
+	#define SHOULD_NOT_OVERRIDE(X)
+	#define SHOULD_NOT_SLEEP(X)
+	#define SHOULD_BE_PURE(X)
+	#define PRIVATE_PROC(X)
+	#define PROTECTED_PROC(X)
+	#define VAR_FINAL var
+	#define VAR_PRIVATE var
+	#define VAR_PROTECTED var
 #endif
 
 /world/proc/enable_debugger()

code/datums/http.dm

@@ -30,7 +30,7 @@
 	id = rustg_http_request_async(method, url, body, headers)
 
 	if (isnull(text2num(id)))
-		CRASH("Proc error: [id]")
+		stack_trace("Proc error: [id]")
 		_raw_response = "Proc error: [id]"
 	else
 		in_progress = TRUE

code/game/machinery/doors/firedoor.dm

@@ -466,7 +466,7 @@
 			constructionStep = CONSTRUCTION_GUTTED
 			update_icon()
 			return TRUE
-		else if(RCD_DECONSTRUCT)
+		if(RCD_DECONSTRUCT)
 			to_chat(user, "<span class='notice'>You deconstruct [src].</span>")
 			qdel(src)
 			return TRUE

code/game/objects/effects/portals.dm

@@ -229,10 +229,10 @@
 			var/obj/projectile/P = M
 			P.ignore_source_check = TRUE
 		return TRUE
-	return FALSE
 	// try to search for a new one if something was var edited etc
 	set_linked()
 	. = ..()
+	return FALSE
 
 /obj/effect/portal/permanent/one_way // doesn't have a return portal
 	name = "one-way portal"

code/modules/antagonists/abductor/equipment/abduction_gear.dm

@@ -517,7 +517,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 		toggle_on(user)
 
 	if(iscyborg(target))
-		if(BATON_STUN)
+		if(mode == BATON_STUN)
 			..()
 		return FALSE
 

dependencies.sh

@@ -23,4 +23,4 @@ export NODE_VERSION=12
 export PHP_VERSION=5.6
 
 # SpacemanDMM git tag
-export SPACEMAN_DMM_VERSION=suite-1.3
+export SPACEMAN_DMM_VERSION=suite-1.4