diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 884fe7b3d..4c434b1fa 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -586,7 +586,7 @@ /obj/structure/sign/poster/official/no_erp name = "No ERP" - desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Kinaris stations." + desc = "This poster reminds the crew that Eroticism and Pornography is banned on station. Is it really though?" icon_state = "poster34_legit" /obj/structure/sign/poster/official/wtf_is_co2 diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index beb0cdd15..a827beaeb 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -909,7 +909,7 @@ /datum/species/golem/cardboard/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H) . = ..() if(user != H) - return FALSE //forced reproduction is rape. + return FALSE //forced reproduction is r/non-con if(istype(I, /obj/item/stack/sheet/cardboard)) var/obj/item/stack/sheet/cardboard/C = I if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 68a8b912b..8bed71df9 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -114,7 +114,7 @@ job_description = "Off-station Syndicate Scientist" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper_s" - flavour_text = "You are a Cybersun branch syndicate agent, employed in a top secret research facility developing biological weapons plants and toys. Fortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile. DON'T abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands! If discovered by Kinaris Corp, consider trade negotiations" + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons plants and toys. Fortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile. DON'T abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!" outfit = /datum/outfit/lavaland_syndicate assignedrole = "Lavaland Syndicate" mirrorcanloadappearance = TRUE @@ -142,7 +142,7 @@ /obj/effect/mob_spawn/human/lavaland_syndicate/comms name = "Syndicate Comms Agent" job_description = "Off-station Syndicate Comms Agent" - flavour_text = "You are a Donk.Co branch syndicate agent, employed in a top secret research facility developing biological weapons plants and toys. Fortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents. DON'T abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands! If discovered by Kinaris Corp, consider trade negotiations" + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons plants and toys. Fortunately, your hated enemy, Nanotrasen activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents. DON'T abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!" outfit = /datum/outfit/lavaland_syndicate/comms mirrorcanloadappearance = TRUE diff --git a/icons/mob/screen_kinaris.dmi b/icons/mob/screen_kinaris.dmi index 40c225ece..dc0d51ee6 100644 Binary files a/icons/mob/screen_kinaris.dmi and b/icons/mob/screen_kinaris.dmi differ diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi index b2c76e3b1..0da33da82 100644 Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ