cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10885 from datlo/freegolemtweaks

Browse Source 
Free Golems tweaks
This commit is contained in:
variableundefined
2019-02-26 08:43:47 +08:00
committed by GitHub
parent 96fc25b2c8 6230d764d5
commit 8266a732bf
7 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
+2
View File
@@ -85,6 +85,8 @@
var/datum/species/golem/X = mob_species
to_chat(new_spawn, "[initial(X.info_text)]")
if(!owner)
to_chat(new_spawn, "<span class='notice'>It is common in free golem societies to respect Adamantine golems as elders, however you do not have to obey them. \
Adamantine golems are the only golems that can resonate to all golems.</span>")
to_chat(new_spawn, "Build golem shells in the autolathe, and feed refined mineral sheets to the shells to bring them to life! You are generally a peaceful group unless provoked.")
to_chat(new_spawn, "<span class='warning'>You are not an antagonist, but you are not a crewmember either. \
You may interact or trade with crew you come across, aswell as defend yourself and your ship \
code/modules/mining/equipment_locker.dm
+2 -2
View File
@@ -460,12 +460,12 @@
prize_list += list(
new /datum/data/mining_equipment("Extra Id", /obj/item/card/id/golem, 250),
new /datum/data/mining_equipment("Science Backpack", /obj/item/storage/backpack/science, 250),
new /datum/data/mining_equipment("Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250),
new /datum/data/mining_equipment("Full Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250),
new /datum/data/mining_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 250),
new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500),
new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000),
new /datum/data/mining_equipment("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000),
new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 1500)
new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000)
)
/datum/data/mining_equipment/
code/modules/mob/living/carbon/brain/MMI.dm
+4 -1
View File
@@ -24,9 +24,12 @@
var/dead_icon = "mmi_dead"
/obj/item/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/organ/internal/brain/crystal ))
if(istype(O, /obj/item/organ/internal/brain/crystal))
to_chat(user, "<span class='warning'> This brain is too malformed to be able to use with the [src].</span>")
return
if(istype(O, /obj/item/organ/internal/brain/golem))
to_chat(user, "<span class='warning'>You can't find a way to plug [O] into [src].</span>")
return
if(istype(O,/obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO
var/obj/item/organ/internal/brain/B = O
if(!B.brainmob)
code/modules/mob/living/carbon/brain/robotic_brain.dm
+4 -1
View File
@@ -28,6 +28,9 @@
return ..()
/obj/item/mmi/robotic_brain/attack_self(mob/user)
if(isgolem(user))
to_chat(user, "<span class='warning'>Your golem fingers are too large to press the switch on [src].</span>")
return
if(requires_master && !imprinted_master)
to_chat(user, "<span class='notice'>You press your thumb on [src] and imprint your user information.</span>")
imprinted_master = user
@@ -231,4 +234,4 @@
silenced = TRUE
requires_master = FALSE
ejected_flavor_text = "metal cube"
dead_icon = "posibrain"
dead_icon = "posibrain"