diff --git a/hyperstation/code/obj/rewards.dm b/hyperstation/code/obj/rewards.dm new file mode 100644 index 00000000..1769f43b --- /dev/null +++ b/hyperstation/code/obj/rewards.dm @@ -0,0 +1,9 @@ +/obj/item/pen/bluemarker + name = "blue marker" + desc = "A simple blueberry scented marker." + icon_state = "marker_blue" + colour = "blue" + +/obj/item/pen/bluemarker/attack_self(mob/user) + user.emote("sniff") + to_chat(user, "Ahh~ blueberries!") \ No newline at end of file diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 1169888b..1ced4827 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 9a735378..2c6bb352 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -7,16 +7,11 @@ path = /obj/item/bikehorn/golden ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard -/datum/gear/donortestingbikehorn - name = "Donor item testing bikehorn" +/datum/gear/testreward + //Just so admins can test the recent rewards added. + name = "test reward" category = SLOT_IN_BACKPACK - path = /obj/item/bikehorn - geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings - -/datum/gear/quotestestitem - name = "Will Plushy" - category = SLOT_IN_BACKPACK - path = /obj/item/toy/plush/mammal/winterbloo + path = /obj/item/pen/bluemarker ckeywhitelist = list("quotefox") /datum/gear/winterblooplush @@ -26,6 +21,7 @@ ckeywhitelist = list("wolfy_wolf967") /datum/gear/winterblooplushextra + //for some reason bloo has had issues with his plushie name = "Will Plush" category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/mammal/winterbloo @@ -36,3 +32,9 @@ category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/lizardplushie/chris ckeywhitelist = list("heliocintrini") + +/datum/gear/seramarker + name = "Blueberry Marker" + category = SLOT_IN_BACKPACK + path = /obj/item/pen/bluemarker + ckeywhitelist = list("blooberri") \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 415a7a2d..ddc463da 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2877,6 +2877,7 @@ #include "hyperstation\code\obj\decal.dm" #include "hyperstation\code\obj\plushes.dm" #include "hyperstation\code\obj\pregnancytester.dm" +#include "hyperstation\code\obj\rewards.dm" #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm"