shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15660 from deathride58/nukeopsatpride

Browse Source 
You've heard of "no cops at pride". Now get ready for...
This commit is contained in:
Lin
2022-06-07 17:18:17 +00:00
committed by GitHub
parent 34c7be870b f2aae2e833
commit a955077ffd
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/roundend.dm
+2
View File
@@ -379,6 +379,8 @@
parts += "[FOURSPACES]Shift Duration: <B>[DisplayTimeText(world.time - SSticker.round_start_time)]</B>" parts += "[FOURSPACES]Shift Duration: <B>[DisplayTimeText(world.time - SSticker.round_start_time)]</B>"
parts += "[FOURSPACES]Station Integrity: <B>[mode.station_was_nuked ? "<span class='redtext'>Destroyed</span>" : "[popcount["station_integrity"]]%"]</B>" parts += "[FOURSPACES]Station Integrity: <B>[mode.station_was_nuked ? "<span class='redtext'>Destroyed</span>" : "[popcount["station_integrity"]]%"]</B>"
if(mode.station_was_nuked && SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
parts += "[FOURSPACES]Gender revealed: <B>[pick(500; "Male", 500; "Female", "Bigender", "Agender", "Demiboy", "Demigirl", "Genderfluid", "Pangender", "Xenogender", "Clown", 50; "What", 50; "Oh no.", 50; "Excuse me?")]</B>"
var/total_players = GLOB.joined_player_list.len var/total_players = GLOB.joined_player_list.len
if(total_players) if(total_players)
parts+= "[FOURSPACES]Total Population: <B>[total_players]</B>" parts+= "[FOURSPACES]Total Population: <B>[total_players]</B>"
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+12
View File
@@ -66,9 +66,21 @@
icon_state = "nuclearbomb_base" icon_state = "nuclearbomb_base"
anchored = TRUE //stops it being moved anchored = TRUE //stops it being moved
/obj/machinery/nuclearbomb/selfdestruct/Initialize(mapload)
. = ..()
if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH] && prob(10))
name = "station-wide gender-reveal terminal"
desc = "For when the whole sector deserves to know a gender. But of whom? Don't ask."
/obj/machinery/nuclearbomb/syndicate /obj/machinery/nuclearbomb/syndicate
//ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb //ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb
/obj/machinery/nuclearbomb/syndicate/Initialize(mapload)
. = ..()
if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH] && prob(50))
name = "tactical gender-reveal device"
desc = "\"But whose gender is it revealing?\" you ponder. Don't worry. That comes later."
/obj/machinery/nuclearbomb/syndicate/get_cinematic_type(off_station) /obj/machinery/nuclearbomb/syndicate/get_cinematic_type(off_station)
var/datum/game_mode/nuclear/NM = SSticker.mode var/datum/game_mode/nuclear/NM = SSticker.mode
switch(off_station) switch(off_station)