From 8564db46436393da71012ba7df8167b52f765a35 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 22 Aug 2015 04:10:44 +0930 Subject: [PATCH 1/4] I am a fucking moron. --- code/modules/mob/new_player/new_player.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 38a6a143b4..fb3b6f4fca 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -420,7 +420,7 @@ var/datum/species/chosen_species if(client.prefs.species) chosen_species = all_species[client.prefs.species] - use_species_name = all_species[chosen_species.get_station_variant()] //Only used by pariahs atm. + use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm. if(chosen_species && use_species_name) // Have to recheck admin due to no usr at roundstart. Latejoins are fine though. From cfa8ab3fd0bf0ab0de57d9b3a1ccaacefc9608b9 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 22 Aug 2015 02:29:04 -0400 Subject: [PATCH 2/4] Removes bear traps from the custodial closet, adds autolathe recipe --- code/game/machinery/autolathe_datums.dm | 6 ++++++ code/game/objects/items/weapons/traps.dm | 1 + html/changelogs/HarpyEagle-traps.yml | 19 +++++++++++++++++++ maps/exodus-1.dmm | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/HarpyEagle-traps.yml diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index ca56b4bf78..f7db56ed5c 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -391,6 +391,12 @@ hidden = 1 category = "Devices and Components" +/datum/autolathe/recipe/beartrap + name = "mechanical trap" + path = /obj/item/weapon/beartrap + hidden = 1 + category = "Devices and Components" + /datum/autolathe/recipe/welder_industrial name = "industrial welding tool" path = /obj/item/weapon/weldingtool/largetank diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index d62b89f3fa..a90bc68904 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -9,6 +9,7 @@ throwforce = 0 w_class = 3 origin_tech = "materials=1" + matter = list(DEFAULT_WALL_MATERIAL = 18750) var/deployed = 0 /obj/item/weapon/beartrap/suicide_act(mob/user) diff --git a/html/changelogs/HarpyEagle-traps.yml b/html/changelogs/HarpyEagle-traps.yml new file mode 100644 index 0000000000..9fae5a9892 --- /dev/null +++ b/html/changelogs/HarpyEagle-traps.yml @@ -0,0 +1,19 @@ +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment + +author: HarpyEagle +delete-after: True + +changes: + - bugfix: "Mechanical traps no longer spawn in the janitor's locker." + - rscadd: "Mechanical traps can now be printed with a hacked autolathe." diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 6e188b4835..0fd3756f40 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -5010,7 +5010,7 @@ "bSr" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/steel,/turf/simulated/floor,/area/janitor) "bSs" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/heads/cmo) "bSt" = (/obj/machinery/computer/crew,/obj/machinery/light,/turf/simulated/floor{dir = 6; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/crew_quarters/heads/cmo) -"bSu" = (/obj/item/weapon/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/weapon/beartrap,/turf/simulated/floor,/area/janitor) +"bSu" = (/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/janitor) "bSv" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2) "bSw" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper) "bSx" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/medbreak) From aff57029e2bf1c390c9c94d67aa44d516100681f Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 22 Aug 2015 11:33:25 +0100 Subject: [PATCH 3/4] add manifest status command --- code/world.dm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/code/world.dm b/code/world.dm index fdb9026760..ac17aa21c0 100644 --- a/code/world.dm +++ b/code/world.dm @@ -150,6 +150,40 @@ var/world_topic_spam_protect_time = world.timeofday return list2params(s) + else if(T == "manifest") + var/list/positions = list() + var/list/set_names = list( + "heads" = command_positions, + "sec" = security_positions, + "eng" = engineering_positions, + "med" = medical_positions, + "sci" = science_positions, + "civ" = civilian_positions, + "bot" = nonhuman_positions + ) + + for(var/datum/data/record/t in data_core.general) + var/name = t.fields["name"] + var/rank = t.fields["rank"] + var/real_rank = make_list_rank(t.fields["real_rank"]) + + var/department = 0 + for(var/k in set_names) + if(real_rank in set_names[k]) + if(!positions[k]) + positions[k] = list() + positions[k][name] = rank + department = 1 + if(!department) + if(!positions["misc"]) + positions["misc"] = list() + positions["misc"][name] = rank + + for(var/k in positions) + positions[k] = list2params(positions[k]) // converts positions["heads"] = list("Bob"="Captain", "Bill"="CMO") into positions["heads"] = "Bob=Captain&Bill=CMO" + + return list2params(positions) + else if(copytext(T,1,9) == "adminmsg") /* We got an adminmsg from IRC bot lets split the input then validate the input. From f1323c35a9e56776600b208afcb0fa0c162d0630 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 22 Aug 2015 14:37:40 +0200 Subject: [PATCH 4/4] Antags are now never eligible to be patient zero. Includes on-station antags. Fixes #10798. --- code/modules/events/viral_infection.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 2eb6121f08..c86a2eacad 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -35,7 +35,7 @@ datum/event/viral_infection/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(G.stat != DEAD && G.is_client_active(5)) + if(G.mind && G.stat != DEAD && G.is_client_active(5) && !player_is_antag(G.mind)) var/turf/T = get_turf(G) if(T.z in config.station_levels) candidates += G