diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 6ecf17c0ef3..3b150cf6a59 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -372,7 +372,7 @@ "ahh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/armoury) "ahi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/armoury) "ahj" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/security/armoury) -"ahk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Armory"; req_access_txt = "3"},/turf/simulated/floor{icon_state = "red"},/area/security/armoury) +"ahk" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Armory"; req_access_txt = "3"},/turf/simulated/floor{icon_state = "red"},/area/security/armoury) "ahl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/security/securehallway) "ahm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "red"},/area/security/securehallway) "ahn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "red"},/area/security/securehallway) diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 7ea73a79ddd..450973dc6a7 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -41,7 +41,7 @@ for(var/mob/living/L in range(1, owner)) if(L == owner) continue L << "\red You are enveloped by a soft green glow emanating from [owner]." - L.radiation += 5 + L.apply_effect(5, IRRADIATE) return OnDrawUnderlays(var/mob/M,var/g,var/fat) @@ -390,4 +390,4 @@ return -*/ \ No newline at end of file +*/ diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 8c63e18fb27..394f582a15d 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -41,28 +41,28 @@ var/global/nologevent = 0 body += "Options panel for [M]" if(M.client) body += " played by [M.client] " - body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" + body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" if(istype(M, /mob/new_player)) body += " Hasn't Entered Game " else - body += " \[Heal\] " + body += " \[Heal\] " body += "

\[ " body += "VV - " - body += "TP - " + body += "TP - " body += "PM - " - body += "SM - " + body += "SM - " body += "[admin_jump_link(M, src)]\]
" body += "Mob type = [M.type]

" - body += "Kick | " + body += "Kick | " body += "Warn | " - body += "Ban | " - body += "Jobban | " - body += "Appearance Ban | " - body += "Notes | " + body += "Ban | " + body += "Jobban | " + body += "Appearance Ban | " + body += "Notes | " if(M.client) if(M.client.check_watchlist(M.client.ckey)) body += "Remove from Watchlist | " @@ -71,31 +71,31 @@ var/global/nologevent = 0 body += "Add to Watchlist " if(M.client) - body += "| Prison | " + body += "| Prison | " body += "\ Send back to Lobby | " var/muted = M.client.prefs.muted body += {"
Mute: - \[IC | - OOC | - PRAY | - ADMINHELP | - DEADCHAT\] - (toggle all) + \[IC | + OOC | + PRAY | + ADMINHELP | + DEADCHAT\] + (toggle all) "} var/jumptoeye = "" if(isAI(M)) var/mob/living/silicon/ai/A = M if(A.client && A.eyeobj) // No point following clientless AI eyes - jumptoeye = " (Eye)" + jumptoeye = " (Eye)" body += {"

- Jump to[jumptoeye] | - Get | - Send To + Jump to[jumptoeye] | + Get | + Send To

- [check_rights(R_ADMIN,0) ? "Traitor panel | " : "" ] - Narrate to | - Subtle message + [check_rights(R_ADMIN,0) ? "Traitor panel | " : "" ] + Narrate to | + Subtle message "} if (M.client) @@ -108,31 +108,31 @@ var/global/nologevent = 0 if(issmall(M)) body += "Monkeyized | " else - body += "Monkeyize | " + body += "Monkeyize | " //Corgi if(iscorgi(M)) body += "Corgized | " else - body += "Corgize | " + body += "Corgize | " //AI / Cyborg if(isAI(M)) body += "Is an AI " else if(ishuman(M)) - body += {"Make AI | - Make Mask | - Make Robot | - Make Alien | - Make Slime | - Make Superhero + body += {"Make AI | + Make Mask | + Make Robot | + Make Alien | + Make Slime | + Make Superhero "} //Simple Animals if(isanimal(M)) - body += "Re-Animalize | " + body += "Re-Animalize | " else - body += "Animalize | " + body += "Animalize | " // DNA2 - Admin Hax if(M.dna && iscarbon(M)) @@ -147,7 +147,7 @@ var/global/nologevent = 0 if(bname) var/bstate=M.dna.GetSEState(block) var/bcolor="[(bstate)?"#006600":"#ff0000"]" - body += "[bname][block]" + body += "[bname][block]" else body += "[block]" body+="" @@ -155,27 +155,27 @@ var/global/nologevent = 0 body += {"

Rudimentary transformation:
These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.
- Observer | - \[ Alien: Drone, - Hunter, - Queen, - Sentinel, - Larva \] - Human - \[ slime: Baby, - Adult \] - Monkey | - Cyborg | - Cat | - Runtime | - Corgi | - Ian | - Crab | - Coffee | - \[ Construct: Armoured , - Builder , - Wraith \] - Shade + Observer | + \[ Alien: Drone, + Hunter, + Queen, + Sentinel, + Larva \] + Human + \[ slime: Baby, + Adult \] + Monkey | + Cyborg | + Cat | + Runtime | + Corgi | + Ian | + Crab | + Coffee | + \[ Construct: Armoured , + Builder , + Wraith \] + Shade
"} @@ -183,12 +183,12 @@ var/global/nologevent = 0 body += {"

Other actions:
- Forcesay | - Admin Room | - Thunderdome 1 | - Thunderdome 2 | - Thunderdome Admin | - Thunderdome Observer | + Forcesay | + Admin Room | + Thunderdome 1 | + Thunderdome 2 | + Thunderdome Admin | + Thunderdome Observer | "} if(M.client.related_accounts_cid.len) body += "

Related accounts by CID: [list2text(M.client.related_accounts_cid, " - ")]
" @@ -234,6 +234,9 @@ var/global/nologevent = 0 if(!check_rights(R_EVENT)) return + + if (!istype(src,/datum/admins)) + src = usr.client.holder var/dat dat = text("Admin Newscaster

Admin Newscaster Unit

") diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 8c57bb0c45b..a064788ebba 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -17,99 +17,110 @@ if (0) // Debug if(check_rights(R_ADMIN,0)) dat += {" - Admin Secrets
-
- Remove all bombs currently in existence
- Bombing List
- Show current traitors and objectives
- Show last [length(lastsignalers)] signalers
- Show last [length(lawchanges)] law changes
- Show AI Laws
- Show Game Mode
- Show Crew Manifest
- List DNA (Blood)
- List Fingerprints

- Break all lights
- Fix all lights
- Make all areas powered
- Make all areas unpowered
- Power all SMES
- Toggle Prison Shuttle Status(Use with S/R)
- Send Prison Shuttle
- Return Prison Shuttle
-
- Launch a shuttle
- Force launch a shuttle
- Jump a shuttle
- Move a shuttle
-
+

Admin Secrets

 + Game
+ Show AI Laws   + Show Game Mode   + Show Crew Manifest
+ Show current traitors and objectives
+ Bombs
+ Bombing List   + Remove all bombs currently in existence + [check_rights(R_SERVER, 0) ? "  Toggle bomb cap
" : "
"] + Lists
+ Show last [length(lastsignalers)] signalers   + Show last [length(lawchanges)] law changes
+ List DNA (Blood)   + List Fingerprints
+ Power
+ Break all lights   + Fix all lights
+ Make all areas powered   + Make all areas unpowered   + Power all SMES
+
+ Shuttle options
+ Launch a shuttle   + Force launch a shuttle
+ Jump a shuttle   + Move a shuttle
+
"} - if(check_rights(R_SERVER,0)) - dat += "Toggle bomb cap
" + else if(check_rights(R_SERVER,0)) //only add this if admin secrets are unavailiable; otherwise, it's added inline + dat += "
Bomb cap: Toggle bomb cap
" dat += "
" if(check_rights(R_DEBUG,0)) dat += {" +
Security Level Elevated

Change all maintenance doors to engie/brig access only
Change all maintenance doors to brig access only
- Remove cap on security officers
- Change Security Level
+ Remove cap on security officers  
Coder Secrets

- Show Job Debug
+ Show Job Debug   Admin Log

+
"} if (1) if(check_rights((R_EVENT|R_SERVER),0)) dat += {" - IC Events
-
- Send in a strike team
- Send in a syndicate strike team
+
+

IC Events

+ Teams
+ Send in a strike team   + Send in a syndicate strike team   Send in a HONKsquad
+ Change Security Level
+ Security Level - Green   + Security Level - Blue   + Security Level - Red
+ Security Level - Gamma   + Security Level - Epsilon   + Security Level - Delta

- Change Security Level To Green
- Change Security Level To Blue
- Change Security Level To Red
- Change Security Level To Gamma
- Change Security Level To Epsilon
- Change Security Level To Delta
-
"} +
"} if (2) if(check_rights((R_SERVER|R_EVENT),0)) dat += {" - OOC Events
-
- The floor is lava! (DANGEROUS: extremely lame)
- Start a Thunderdome match
- Reset Thunderdome to default state
- Remove 'internal' clothing
+
+

OOC Events

+ Thunderdome
+ Start a Thunderdome match   + Reset Thunderdome to default state

+ Clothing
+ Remove 'internal' clothing   Remove ALL clothing
- Turn all humans into monkeys
- Remove firesuits, grilles, and pods
- Warp all Players to Prison
- Triple AI mode (needs to be used in the lobby)
- Everyone is the traitor
- There can only be one!
+ TDM
+ Everyone is the traitor   + There can only be one!   Dodgeball (TDM)!
- Ghost Mode
- Make all players retarded
+ Round-enders
+ The floor is lava! (DANGEROUS: extremely lame)
+ Turn all humans into monkeys
Make all items look like guns
- Japanese Animes Mode
+ Warp all Players to Prison
+ Make all players retarded
+ Misc
+ Remove firesuits, grilles, and pods   + Triple AI mode (needs to be used in the lobby)
+ Ghost Mode   + Japanese Animes Mode   Egalitarian Station Mode
- Summon Guns
- Summon Magic
+ Summon Guns   + Summon Magic
Roll the Dice
-
"} +
+
"} dat += "" - var/datum/browser/popup = new(usr, "secrets", "
Admin Secrets
", 610, 650) + var/datum/browser/popup = new(usr, "secrets", "
Admin Secrets
", 630, 670) popup.set_content(dat) popup.open(0) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 2b277a70ee8..cff4e611d65 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -9,7 +9,7 @@ if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list)) check_antagonists() return - + if(href_list["rejectadminhelp"]) if(!check_rights(R_ADMIN|R_MOD)) return @@ -905,7 +905,7 @@ feedback_add_details("ban_job","- [job]") jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") if(!msg) msg = job - else msg += ", [job]" + else msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) M << "\redYou have been jobbanned by [usr.client.ckey] from: [msg]." @@ -1000,7 +1000,7 @@ if(query_noteedits.NextRow()) var/edit_log = query_noteedits.item[1] usr << browse(edit_log,"window=noteedits") - + else if(href_list["removejobban"]) if(!check_rights(R_BAN)) return @@ -1085,7 +1085,7 @@ else if(href_list["watchremove"]) var/target_ckey = href_list["watchremove"] var/confirm = alert("Are you sure you want to remove [target_ckey] from the watchlist?", "Confirm Watchlist Removal", "Yes", "No") - if(confirm == "Yes") + if(confirm == "Yes") usr.client.watchlist_remove(target_ckey) else if(href_list["watchedit"]) @@ -1119,8 +1119,8 @@ return if(query_watchedits.NextRow()) var/edit_log = query_watchedits.item[1] - usr << browse(edit_log,"window=watchedits") - + usr << browse(edit_log,"window=watchedits") + else if(href_list["mute"]) if(!check_rights(R_ADMIN|R_MOD)) return @@ -1542,7 +1542,7 @@ if(!isobserver(usr)) C.admin_ghost() sleep(2) C.jumptomob(M) - + else if(href_list["adminplayerobservefollow"]) if(!check_rights(R_ADMIN|R_MOD)) return @@ -2142,7 +2142,7 @@ message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]") break return - + else if(href_list["kick_all_from_lobby"]) if(!check_rights(R_ADMIN)) return @@ -2270,34 +2270,6 @@ log_admin("[key_name(usr)] made all SMESs powered", 1) message_admins("\blue [key_name_admin(usr)] made all SMESs powered", 1) power_restore_quick() - if("activateprison") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","AP") - world << "\blue Transit signature detected." - world << "\blue Incoming shuttle." - /* - var/A = locate(/area/shuttle_prison) - for(var/atom/movable/AM as mob|obj in A) - AM.z = 1 - AM.Move() - */ - message_admins("\blue [key_name_admin(usr)] sent the prison shuttle to the station.", 1) - if("deactivateprison") - /* - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","DP") - var/A = locate(/area/shuttle_prison) - for(var/atom/movable/AM as mob|obj in A) - AM.z = 2 - AM.Move() - */ - message_admins("\blue [key_name_admin(usr)] sent the prison shuttle back.", 1) - if("toggleprisonstatus") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","TPS") - for(var/obj/machinery/computer/prison_shuttle/PS in world) - PS.allowedtocall = !(PS.allowedtocall) - message_admins("\blue [key_name_admin(usr)] toggled status of prison shuttle to [PS.allowedtocall].", 1) if("prisonwarp") if(!ticker) alert("The game hasn't started yet!", null, null, null, null, null) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index c79224d2e5a..0eae2206ba0 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -185,7 +185,7 @@ set category = "Preferences" set desc = "Toggles hearing musical instruments like the violin and piano" prefs.toggles ^= SOUND_INSTRUMENTS - prefs.save_preferences() + prefs.save_preferences(src) if(prefs.toggles & SOUND_INSTRUMENTS) src << "You will now hear people playing musical instruments." else diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index a6aa9e2dcbb..3894d69e54f 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -70,11 +70,14 @@ var/movable = 0 /obj/effect/plant/Destroy() + if(buckled_mob) + unbuckle() if(plant_controller) plant_controller.remove_plant(src) for(var/obj/effect/plant/neighbor in range(1,src)) plant_controller.add_plant(neighbor) return ..() + /obj/effect/plant/single spread_chance = 0