cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 08:27:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Posshim's fix - of a fix - of a fix - of a fix

Browse Source 
I cannot be trusted with PRs.

I missed / messed up two things from the last pull.
This commit is contained in:
Oposshim
2020-11-30 11:30:55 -05:00
parent e6cc206c12
commit c8cf5e2fb7
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/golems.dm
+1 -1
View File
@@ -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
code/modules/ruins/lavaland_ruin_code.dm
+2 -2
View File
@@ -114,7 +114,7 @@
job_description = "Off-station Syndicate Scientist"
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
flavour_text = "<span class='big bold'>You are a Cybersun branch syndicate agent,</span><b> 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. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> 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</b>"
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> 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. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
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 = "<span class='big bold'>You are a Donk.Co branch syndicate agent,</span><b> 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. <b>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. <font size=6>DON'T</font> abandon the base without good cause.</b> 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</b>"
flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> 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. <b>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. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
outfit = /datum/outfit/lavaland_syndicate/comms
mirrorcanloadappearance = TRUE