diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 32c88cee80cc..694d60dc1162 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -62,6 +62,7 @@ #define CIV_JOB_GROW 12 #define CIV_JOB_ATMOS 13 #define CIV_JOB_RANDOM 14 +#define CIV_JOB_SCI_HEAD 15 //By how much should the station's inflation value be multiplied by when dividing the civilian bounty's reward? #define BOUNTY_MULTIPLIER 10 diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index fbf8c92621cd..f0e61c8282c0 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -192,7 +192,7 @@ #define DEPARTMENT_CENTRAL_COMMAND "Central Command" #define DEPARTMENT_BITFLAG_LATE (1<<12) -#define DEPARTMENT_LATE "Late Join" +#define DEPARTMENT_LATE "Late Arrival" /* Job datum job_flags */ /// Whether the mob is announced on arrival. diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm index 92ccafc40f89..b88a2bc37a36 100644 --- a/code/modules/cargo/bounty.dm +++ b/code/modules/cargo/bounty.dm @@ -44,8 +44,11 @@ switch(bounty_num) if(CIV_JOB_BASIC) chosen_type = pick(subtypesof(/datum/bounty/item/assistant)) - if(CIV_JOB_ROBO) - chosen_type = pick(subtypesof(/datum/bounty/item/mech)) + if(CIV_JOB_ROBO) //monkestation edit: bot bounties + if(prob(50)) + chosen_type = pick(subtypesof(/datum/bounty/item/mech)) + else + chosen_type = pick(subtypesof(/datum/bounty/item/bot)) if(CIV_JOB_CHEF) chosen_type = pick(subtypesof(/datum/bounty/item/chef) + subtypesof(/datum/bounty/reagent/chef)) if(CIV_JOB_SEC) @@ -67,6 +70,17 @@ chosen_type = pick(subtypesof(/datum/bounty/item/science)) else chosen_type = pick(subtypesof(/datum/bounty/item/slime)) + if(CIV_JOB_SCI_HEAD) //monkestation addition : RD bounties. 50% for science bounty, 50% for robo bounty. + if(prob(50)) + if(prob(50)) + chosen_type = pick(subtypesof(/datum/bounty/item/science)) + else + chosen_type = pick(subtypesof(/datum/bounty/item/slime)) + else + if(prob(50)) + chosen_type = pick(subtypesof(/datum/bounty/item/mech)) + else + chosen_type = pick(subtypesof(/datum/bounty/item/bot)) if(CIV_JOB_ENG) chosen_type = pick(subtypesof(/datum/bounty/item/engineering)) if(CIV_JOB_MINE) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 9df9c53233b6..679c04335989 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -576,6 +576,9 @@ acid = 50 // MONKESTATION ADDITION START +/obj/item/clothing/gloves/chameleon + clothing_traits = list(TRAIT_CAN_SIGN_ON_COMMS) + /obj/item/clothing/gloves/chameleon/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour != TOOL_MULTITOOL) return ..() diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index b8ba0f237606..8e15aa246a4e 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -31,7 +31,7 @@ liver_traits = list(TRAIT_ROYAL_METABOLISM, TRAIT_BALLMER_SCIENTIST) display_order = JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR - bounty_types = CIV_JOB_SCI + bounty_types = CIV_JOB_SCI_HEAD mail_goodies = list( /obj/item/storage/box/monkeycubes = 30, diff --git a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm index 2cdf99b9d2ed..b52c2d137c2d 100644 --- a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm +++ b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm @@ -110,6 +110,11 @@ /obj/item/trash, /obj/item/food/deadmouse, /obj/effect/decal/remains, + //monkestation addition: start + /obj/item/cigbutt, + /obj/item/storage/box/foodpack, + /obj/item/ammo_casing, + //monkestation addition: end )) ///drawings we hunt var/static/list/cleanable_drawings = typecacheof(list(/obj/effect/decal/cleanable/crayon)) diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi index e156a233e732..44a25f5407ed 100644 Binary files a/icons/mob/landmarks.dmi and b/icons/mob/landmarks.dmi differ diff --git a/monkestation/code/datums/components/crafting/robot.dm b/monkestation/code/datums/components/crafting/robot.dm new file mode 100644 index 000000000000..4aac9aa661ed --- /dev/null +++ b/monkestation/code/datums/components/crafting/robot.dm @@ -0,0 +1,14 @@ +/datum/crafting_recipe/cleanbot_jr + name = "Scrubs Junior" + desc = "A little cleaning robot, he graduated from medical school!" + result = /mob/living/basic/bot/cleanbot/medbay/jr + reqs = list( + /obj/item/reagent_containers/cup/bucket = 1, + /obj/item/assembly/prox_sensor = 1, + /obj/item/assembly/health = 1, + /obj/item/bodypart/arm/right/robot = 1, + + ) + parts = list(/obj/item/reagent_containers/cup/bucket = 1) + time = 5 SECONDS + category = CAT_ROBOT diff --git a/monkestation/code/modules/assault_ops/code/areas.dm b/monkestation/code/modules/assault_ops/code/areas.dm index df2aacfdd998..f3bf44b5bd56 100644 --- a/monkestation/code/modules/assault_ops/code/areas.dm +++ b/monkestation/code/modules/assault_ops/code/areas.dm @@ -56,8 +56,7 @@ /obj/effect/landmark/start/assaultop name = "assaultop" - icon = 'icons/effects/landmarks_static.dmi' - icon_state = "snukeop_spawn" + icon_state = "Assault Operatives" delete_after_roundstart = FALSE /obj/effect/landmark/start/assaultop/Initialize(mapload) diff --git a/monkestation/code/modules/blueshield/landmarks.dm b/monkestation/code/modules/blueshield/landmarks.dm index e812eaee96b8..1153629768f6 100644 --- a/monkestation/code/modules/blueshield/landmarks.dm +++ b/monkestation/code/modules/blueshield/landmarks.dm @@ -1,2 +1,3 @@ /obj/effect/landmark/start/blueshield name = "Blueshield" + icon_state = "Blueshield" diff --git a/monkestation/code/modules/cargo/bounties/bot.dm b/monkestation/code/modules/cargo/bounties/bot.dm new file mode 100644 index 000000000000..3fa7ce5ff14b --- /dev/null +++ b/monkestation/code/modules/cargo/bounties/bot.dm @@ -0,0 +1,23 @@ +/datum/bounty/item/bot/cleanbot_jr //JR. models to prevent them from mass selling station cleanbots + name = "Scrubs Junior., PA" + description = "Medical is looking worse than the kitchen cold room and janitors are nowhere to be found. We need a cleanbot for medical before the Chief Medical Officer has a breakdown." + reward = CARGO_CRATE_VALUE * 2.5 + wanted_types = list(/mob/living/basic/bot/cleanbot/medbay/jr = TRUE) + +/datum/bounty/item/bot/floorbot + name = "Floorbot" + description = "Out last floorbot went haywire and removed all our floors. So we need another floorbot to replace the priors issues." + reward = CARGO_CRATE_VALUE * 3 + wanted_types = list(/mob/living/simple_animal/bot/floorbot = TRUE) + +/datum/bounty/item/bot/honkbot + name = "Honkbot" + description = "Mr. Gigglesworth birthday is around the corner and we didn't get a present. Ship us off a honkbot to giftwrap please." + reward = CARGO_CRATE_VALUE * 5 + wanted_types = list(/mob/living/simple_animal/bot/secbot/honkbot = TRUE) + +/datum/bounty/item/bot/firebot + name = "Firebot" + description = "An assistant waving around some license broke into atmospherics and its now all on fire. Send us a Firebot before the gas fire leaks further." + reward = CARGO_CRATE_VALUE * 4 + wanted_types = list(/mob/living/simple_animal/bot/firebot = TRUE) diff --git a/monkestation/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm b/monkestation/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm new file mode 100644 index 000000000000..efd15941148d --- /dev/null +++ b/monkestation/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm @@ -0,0 +1,2 @@ +/mob/living/basic/bot/cleanbot/medbay/jr + name = "Scrubs Junior, PA" diff --git a/tgstation.dme b/tgstation.dme index 9dfd9d576f7f..8f57109c94c9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5958,6 +5958,7 @@ #include "monkestation\code\datums\components\turf_healing.dm" #include "monkestation\code\datums\components\uplink.dm" #include "monkestation\code\datums\components\wound_converter.dm" +#include "monkestation\code\datums\components\crafting\robot.dm" #include "monkestation\code\datums\components\riding\riding_mob.dm" #include "monkestation\code\datums\components\riding\riding_vehicle.dm" #include "monkestation\code\datums\diseases\advance\symptoms\clockwork.dm" @@ -6992,6 +6993,7 @@ #include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\pain_limp.dm" #include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\sharp_pain.dm" #include "monkestation\code\modules\can_spessmen_feel_pain\pain\status_effects\temp_pack.dm" +#include "monkestation\code\modules\cargo\bounties\bot.dm" #include "monkestation\code\modules\cargo\bounties\pathology.dm" #include "monkestation\code\modules\cargo\crates\costumes_toys.dm" #include "monkestation\code\modules\cargo\crates\emergency.dm" @@ -7529,6 +7531,7 @@ #include "monkestation\code\modules\mob\living\living_update_icons.dm" #include "monkestation\code\modules\mob\living\status_procs.dm" #include "monkestation\code\modules\mob\living\basic\animatronic.dm" +#include "monkestation\code\modules\mob\living\basic\bots\cleanbot\cleanbot.dm" #include "monkestation\code\modules\mob\living\basic\bots\medbot\medbot.dm" #include "monkestation\code\modules\mob\living\basic\drone\_drone.dm" #include "monkestation\code\modules\mob\living\basic\drone\bardrone.dm"