Skip to content

Commit

Permalink
Well I got sleep
Browse files Browse the repository at this point in the history
  • Loading branch information
Gw0sty committed Sep 29, 2024
1 parent bb4aee7 commit 58a09b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
3 changes: 2 additions & 1 deletion code/game/objects/items/storage/boxes/science_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ obj/item/storage/box/nanitecontrol/PopulateContents()
var/static/items_inside = list(
/obj/item/nanite_remote = 3,
/obj/item/nanite_scanner = 3,
// /obj/item/nanite_injector = 1, //coded out as its been on blueshift and noones had issues with it but there probably should be a discussion before added everywhere.
// /obj/item/nanite_injector = 1,
//coded out as its been on blueshift and noones had issues with it but there probably should be a discussion before added everywhere.
)
/obj/item/storage/box/monkeycubes
name = "monkey cube box"
Expand Down
16 changes: 0 additions & 16 deletions monkestation/code/game/objects/items/admin_plushies.dm
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
// This is where all of the MonkeStation Admin Plushies SHOULD be stored

// Plushies
/obj/item/toy/plush/admin
name = "admin plushie"
desc = "if you're seeing this there's an issue."
icon = 'monkestation/icons/obj/admin_plushies.dmi'
icon_state = ""
/// A string of text that is optionaly added to the objects desc, it SHOULD be the admin's CKEY.
var/adminCKey = null

/obj/item/toy/plush/admin/Initialize(mapload)
. = ..()
if(adminCKey)
desc = "[desc]" + " " + "(A member of our beloved admin team- ''[adminCKey]'')"
else
desc = "[desc]" + " " + "(A member of our beloved admin team)"

/obj/item/toy/plush/admin/ben_mothman
name = "ben mothman"
desc = "HAH this guy is short! Laugh at him.. this is an order!"
Expand Down

0 comments on commit 58a09b8

Please sign in to comment.