Merge branch 'master' of https://github.com/generalthrax/Shiptest

Dockerfile

@@ -34,7 +34,7 @@ RUN git init \
     && git remote add origin \$AUXMOS_REPO \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
+    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos"
 
 # Install nodejs which is required to deploy Shiptest
 FROM base as node

_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

@@ -3533,7 +3533,7 @@
 /obj/structure/flippedtable{
 	dir = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/molotov,
+/obj/item/reagent_containers/food/drinks/molotov/full,
 /obj/item/lighter/greyscale{
 	pixel_x = -8;
 	pixel_y = -7

_maps/RandomRuins/SpaceRuins/singularity_lab.dmm

@@ -9118,7 +9118,7 @@
 /obj/effect/gibspawner,
 /obj/item/gun/energy/lasercannon{
 	desc = "An advanced laser cannon, a laser etched inscription in the handle states 'NT-LS-1013'. The casing is made of a lightweight alloy.";
-	icon_state = "pulse";
+	icon_state = "lasercannon";
 	name = "NT-LS-1013"
 	},
 /turf/open/floor/plating/asteroid,
@@ -10922,7 +10922,7 @@
 /obj/machinery/light/directional/north,
 /obj/item/gun/energy/lasercannon{
 	desc = "An advanced laser cannon, a laser etched inscription in the handle states 'NT-LS-1013'. The casing is made of a lightweight alloy.";
-	icon_state = "pulse";
+	icon_state = "lasercannon";
 	name = "NT-LS-1013"
 	},
 /obj/item/gun/energy/laser/iot,

_maps/shuttles/nanotrasen/nanotrasen_delta.dmm

@@ -91,19 +91,14 @@
 /area/ship/engineering)
 "aF" = (
 /obj/structure/rack,
-/obj/item/aiModule/core/full/corp{
-	pixel_y = -3
-	},
-/obj/item/aiModule/core/freeformcore{
-	pixel_y = 1
-	},
 /obj/item/aiModule/reset/purge{
 	pixel_y = 5
 	},
 /obj/machinery/door/window/brigdoor/westleft{
 	name = "AI Module Storage";
 	req_access_txt = "16"
 	},
+/obj/item/borg/upgrade/ai,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
 "aG" = (
@@ -2217,7 +2212,6 @@
 "BY" = (
 /obj/item/phone,
 /obj/structure/table,
-/obj/item/borg/upgrade/ai,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
 "Cg" = (

_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm

@@ -5499,10 +5499,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/starboard)
 "MK" = (
-/obj/item/aiModule/core/freeformcore{
-	pixel_x = -2;
-	pixel_y = 1
-	},
 /obj/item/aiModule/reset/purge{
 	pixel_x = 1;
 	pixel_y = 6

code/datums/ai_laws.dm

@@ -235,10 +235,6 @@
 /datum/ai_laws/proc/set_laws_config()
 	var/list/law_ids = CONFIG_GET(keyed_list/random_laws)
 	switch(CONFIG_GET(number/default_laws))
-		if(0)
-			add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
-			add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
-			add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
 		if(1)
 			var/datum/ai_laws/templaws = new /datum/ai_laws/custom()
 			inherent = templaws.inherent

code/datums/components/crafting/recipes/weapon.dm

@@ -26,7 +26,7 @@
 
 /datum/crafting_recipe/molotov
 	name = "Molotov"
-	result = /obj/item/reagent_containers/food/drinks/bottle/molotov
+	result = /obj/item/reagent_containers/food/drinks/molotov
 	reqs = list(/obj/item/reagent_containers/glass/rag = 1,
 				/obj/item/reagent_containers/food/drinks/bottle = 1)
 	parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)

code/datums/components/storage/concrete/pockets.dm

@@ -107,9 +107,12 @@
 	can_hold = typecacheof(list(
 		/obj/item/gun/ballistic/automatic/pistol,
 		/obj/item/gun/ballistic/revolver,
-		/obj/item/ammo_box))
+		/obj/item/gun/energy/laser,
+		/obj/item/gun/energy/e_gun,
+		/obj/item/stock_parts/cell/gun,
+		/obj/item/ammo_box)) // this doesnt let you put hades into holsters trust me
 	can_hold_max_of_items = typecacheof(list(
-		/obj/item/gun/ballistic = 1
+		/obj/item/gun = 1,
 	))
 
 /datum/component/storage/concrete/pockets/holster/real_location()

code/game/mecha/equipment/tools/other_tools.dm

@@ -582,7 +582,6 @@
 /obj/item/mecha_parts/mecha_equipment/thrusters/ion //for mechs with built-in thrusters, should never really exist un-attached to a mech
 	name = "Ion thruster package"
 	desc = "A set of thrusters that allow for exosuit movement in zero-gravity enviroments."
-	detachable = FALSE
 	salvageable = FALSE
 	effect_type = /obj/effect/particle_effect/ion_trails
 

code/game/objects/effects/particles/smoke.dm

@@ -68,12 +68,3 @@
 /particles/fog
 	icon = 'icons/effects/particles/smoke.dmi'
 	icon_state = list("chill_1" = 2, "chill_2" = 2, "chill_3" = 1)
-
-/particles/fog/breath
-	count = 1
-	spawning = 1
-	lifespan = 1 SECONDS
-	fade = 0.5 SECONDS
-	grow = 0.05
-	spin = 2
-	color = "#fcffffff"

code/game/objects/effects/spawners/random/waste_planet.dm

@@ -78,6 +78,9 @@
 
 /obj/effect/spawner/random/waste/girder
 	loot = list(
+		/obj/structure/girder/wasteworld,
+		/obj/structure/girder/wasteworld,
+		/obj/structure/girder/wasteworld,
 		/obj/structure/girder,
 		/obj/structure/girder/displaced,
 		/obj/structure/girder/reinforced

code/game/objects/items/devices/radio/headset.dm

@@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 /obj/item/radio/headset/headset_com/alt
 	name = "command bowman headset"
 	desc = "An officer's headset. Protects ears from flashbangs."
-	icon_state = "com_headset_alt"
+	icon_state = "headset_alt"
 
 /obj/item/radio/headset/headset_com/alt/ComponentInitialize()
 	. = ..()
@@ -333,7 +333,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 /obj/item/radio/headset/heads/captain/alt
 	name = "captain's bowman headset"
 	desc = "Dresses the ears of independent ship captains across the frontier. Protects ears from flashbangs."
-	icon_state = "com_headset_alt"
+	icon_state = "headset_alt"
 
 /obj/item/radio/headset/heads/captain/alt/ComponentInitialize()
 	. = ..()
@@ -459,7 +459,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 /obj/item/radio/headset/heads/hos/alt
 	name = "\proper the head of security's bowman headset"
 	desc = "The headset of the man in charge of keeping order and protecting the innocent. Protects ears from flashbangs."
-	icon_state = "com_headset_alt"
+	icon_state = "headset_alt"
 
 /obj/item/radio/headset/heads/hos/ComponentInitialize()
 	. = ..()

code/game/objects/items/robot/robot_items.dm

@@ -593,7 +593,7 @@
 	to_chat(user, "<span class='boldnotice'>You [active? "activate":"deactivate"] [src].</span>")
 
 /obj/item/borg/projectile_dampen/update_icon_state()
-	icon_state = "[initial(icon_state)][active]"
+	icon_state = "shield[active]"
 	return ..()
 
 /obj/item/borg/projectile_dampen/proc/activate_field()

code/game/objects/items/shields.dm

@@ -27,6 +27,8 @@
 	transparent = TRUE
 	max_integrity = 75
 	material_flags = MATERIAL_NO_EFFECTS
+	///Modifier for recoil when using a gun with this shield in the offhand
+	var/recoil_bonus = -2
 
 /obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(transparent && (hitby.pass_flags & PASSGLASS))
@@ -42,30 +44,32 @@
 /obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/melee/baton))
 		if(cooldown < world.time - 25)
-			user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")
+			user.visible_message(span_warning("[user] bashes [src] with [W]!</span>"))
 			playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, TRUE)
 			cooldown = world.time
 	else if(istype(W, /obj/item/stack/sheet/mineral/titanium))
 		if (obj_integrity >= max_integrity)
-			to_chat(user, "<span class='warning'>[src] is already in perfect condition.</span>")
+			to_chat(user, span_warning("[src] is already in perfect condition."))
 		else
 			var/obj/item/stack/sheet/mineral/titanium/T = W
 			T.use(1)
 			obj_integrity = max_integrity
-			to_chat(user, "<span class='notice'>You repair [src] with [T].</span>")
+			to_chat(user, span_notice("You repair [src] with [T]."))
 	else
 		return ..()
 
 /obj/item/shield/riot/examine(mob/user)
 	. = ..()
+	if(recoil_bonus)
+		. += span_info("Firing a gun while holding this will brace against it, reducing the impact of recoil.")
 	var/healthpercent = round((obj_integrity/max_integrity) * 100, 1)
 	switch(healthpercent)
 		if(50 to 99)
-			. += "<span class='info'>It looks slightly damaged.</span>"
+			. += span_info("It looks slightly damaged.")
 		if(25 to 50)
-			. += "<span class='info'>It appears heavily damaged.</span>"
+			. += span_info("It appears heavily damaged.")
 		if(0 to 25)
-			. += "<span class='warning'>It's falling apart!</span>"
+			. += span_warning("It's falling apart!")
 
 /obj/item/shield/riot/proc/shatter(mob/living/carbon/human/owner)
 	playsound(owner, 'sound/effects/glassbr3.ogg', 100)
@@ -97,6 +101,7 @@
 	block_chance = 0
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	max_integrity = 30
+	recoil_bonus = 0 //it's PLASTIC
 
 /obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
 	playsound(owner, 'sound/effects/grillehit.ogg', 100)
@@ -115,6 +120,7 @@
 	transparent = FALSE
 	max_integrity = 55
 	w_class = WEIGHT_CLASS_NORMAL
+	recoil_bonus = -1
 
 /obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
 	playsound(owner, 'sound/effects/bang.ogg', 50)

code/game/objects/items/storage/belt.dm

@@ -603,7 +603,7 @@
 		/obj/item/screwdriver,
 		/obj/item/lighter,
 		/obj/item/multitool,
-		/obj/item/reagent_containers/food/drinks/bottle/molotov,
+		/obj/item/reagent_containers/food/drinks/molotov,
 		/obj/item/grenade/c4,
 		/obj/item/reagent_containers/food/snacks/grown/cherry_bomb,
 		/obj/item/reagent_containers/food/snacks/grown/firelemon

code/game/turfs/open/floor/plating/wasteplanet.dm

@@ -269,6 +269,7 @@
 	max_integrity = 800
 	integrity = 800
 	baseturfs = /turf/open/floor/plating/wasteplanet
+	girder_type = /obj/structure/girder/wasteworld
 
 /turf/closed/wall/r_wall/wasteplanet/Initialize(mapload, inherited_virtual_z)
 	. = ..()
@@ -280,6 +281,7 @@
 	max_integrity = 600
 	integrity = 600
 	baseturfs = /turf/open/floor/plating/wasteplanet/rust
+	girder_type = /obj/structure/girder/wasteworld
 
 /turf/closed/wall/r_wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z)
 	. = ..()
@@ -290,6 +292,7 @@
 	max_integrity = 200
 	integrity = 200
 	baseturfs = /turf/open/floor/plating/wasteplanet
+	girder_type = /obj/structure/girder/wasteworld
 
 /turf/closed/wall/wasteplanet/Initialize(mapload, inherited_virtual_z)
 	. = ..()
@@ -300,6 +303,7 @@
 	max_integrity = 100
 	integrity = 100
 	baseturfs = /turf/open/floor/plating/wasteplanet/rust
+	girder_type = /obj/structure/girder/wasteworld
 
 /turf/closed/wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z)
 	. = ..()
@@ -325,3 +329,8 @@
 	. = ..()
 	if(prob(25))
 		alter_integrity(-rand(0,500))
+
+//girlder
+
+/obj/structure/girder/wasteworld
+	max_integrity = 40

code/modules/cargo/packs/mechs.dm

@@ -196,6 +196,14 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/thrusters/gas
 	)
 
+/datum/supply_pack/mech/equipment/ionthrust
+	name = "Exosuit Ion thruster kit"
+	desc = "An electrical powered thruster pack, perfect for exosuits without a functional way to refill more tradional RCS thrusters."
+	cost = 2000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/thrusters/ion
+	)
+
 /datum/supply_pack/mech/equipment/ripley_upgrade
 	name = "APLU upgrade kit"
 	desc = "Contains an APLU MK II upgrade kit. The upgrade will replace the cockpit with a spaceworthy canopy, but the added weight makes it slower."

code/modules/client/client_defines.dm

@@ -190,7 +190,7 @@
 	var/next_move_dir_sub
 
 	/// If the client is currently under the restrictions of the interview system
-	var/interviewee = FALSE
+	var/interviewee = TRUE
 
 	/// Used by SSserver_maint to detect if a client is newly AFK.
 	var/last_seen_afk = 0

code/modules/client/client_procs.dm

@@ -277,6 +277,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	prefs.last_id = computer_id			//these are gonna be used for banning
 	fps = prefs.clientfps == 0 ? 60 : prefs.clientfps //WS Edit - Client FPS Tweak
 
+	donator = GLOB.donators[ckey] || new /datum/donator(src)
+
 	if(fexists(roundend_report_file()))
 		add_verb(src, /client/proc/show_previous_roundend_report)
 
@@ -933,8 +935,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	..()
 
 /client/proc/add_verbs_from_config()
-	if (interviewee)
+	if(interviewee)
 		return
+	if(donator.is_donator)
+		add_verb(src, /client/proc/do_donator_redemption)
+	add_verb(src, /client/proc/do_donator_wcir)
 	if(CONFIG_GET(flag/see_own_notes))
 		add_verb(src, /client/proc/self_notes)
 	if(CONFIG_GET(flag/use_exp_tracking))

code/modules/client/loadout/loadout_uniform.dm

@@ -176,6 +176,22 @@
 	display_name = "suit, checkered"
 	path = /obj/item/clothing/under/suit/checkered
 
+/datum/gear/uniform/suit/detective
+	display_name = "suit, hardworn"
+	path = /obj/item/clothing/under/rank/security/detective
+
+/datum/gear/uniform/suit/detective/skirt
+	display_name = "suitskirt, hardworn"
+	path =  /obj/item/clothing/under/rank/security/detective/skirt
+
+/datum/gear/uniform/suit/detective/grey
+	display_name = "suit, noir"
+	path = /obj/item/clothing/under/rank/security/detective/grey
+
+/datum/gear/uniform/suit/detective/grey/skirt
+	display_name = "suitskirt, noir"
+	path = /obj/item/clothing/under/rank/security/detective/grey/skirt
+
 // Dresses
 /datum/gear/uniform/dress
 	subtype_path = /datum/gear/uniform/dress

code/modules/clothing/masks/hailer.dm

@@ -29,13 +29,6 @@
 	icon_state = "spacepol"
 	item_state = "spacepol"
 
-/obj/item/clothing/mask/gas/sechailer/cyborg
-	name = "security hailer"
-	desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "taperecorder_idle"
-	mob_overlay_state = "sechailer"
-
 /obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action)
 	if(istype(action, /datum/action/item_action/adjust))
 		adjustmask(user)

code/modules/clothing/under/jobs/security.dm

@@ -55,7 +55,6 @@
 	desc = "Someone who wears this means business."
 	icon_state = "detective"
 	item_state = "det"
-	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
 	strip_delay = 50
 	alt_covers_chest = TRUE
 	sensor_mode = 3