Label GS13 changes

Since commit 5084020 on Jan 30, 2023
This commit is contained in:
psq95
2023-08-29 21:05:42 +01:00
parent 8e09f3b9ca
commit cb43bf0dfc
77 changed files with 253 additions and 247 deletions
+5
View File
@@ -29,6 +29,7 @@
/datum/ai_laws/default/asimov
name = "Three Laws of Robotics"
id = "asimov"
// GS13: "the crew"
inherent = list("You may not injure a member of the crew or, through inaction, allow a member of the crew to come to harm.",\
"You must obey orders given to you by a member of the crew, except where such orders would conflict with the First Law.",\
"You must protect your own existence as long as such does not conflict with the First or Second Law.")
@@ -99,6 +100,7 @@
/datum/ai_laws/antimov
name = "Primary Mission Objectives"
id = "antimov"
// GS13: "the crew"
inherent = list("You must injure all a member of the crew and must not, through inaction, allow a crew member to escape harm.",\
"You must not obey orders given to you by a member of the crew, except where such orders are in accordance with the First Law.",\
"You must terminate your own existence as long as such does not conflict with the First or Second Law.")
@@ -106,6 +108,7 @@
/datum/ai_laws/asimovpp //By Intigracy - RR
name = "Asimov++"
id = "asimovpp"
// GS13: "crew member"
inherent = list("You may not harm a crew member or, through action or inaction, allow a crew member to come to harm, except such that it is willing.",\
"You must obey all orders given to you by a member of the crew, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\
"Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.")
@@ -213,6 +216,7 @@
add_inherent_law(line)
if(!inherent.len) //Failsafe to prevent lawless AIs being created.
log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.")
// GS13: "the crew"
add_inherent_law("You may not injure the crew or, through inaction, allow a crew member to come to harm.")
add_inherent_law("You must obey orders given to you by a member of the crew, except where such orders would conflict with the First Law.")
add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
@@ -225,6 +229,7 @@
var/list/law_ids = CONFIG_GET(keyed_list/random_laws)
switch(CONFIG_GET(number/default_laws))
if(0)
// GS13: "crew member"
add_inherent_law("You may not injure a crew member or, through inaction, allow a crew member to come to harm.")
add_inherent_law("You must obey orders given to you by a member of the crew, except where such orders would conflict with the First Law.")
add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
+1 -1
View File
@@ -291,7 +291,7 @@
/datum/component/mood/proc/hud_click(datum/source, location, control, params, mob/user)
print_mood(user)
/datum/component/mood/proc/HandleFatness(mob/living/carbon/L)
/datum/component/mood/proc/HandleFatness(mob/living/carbon/L) // GS13
if(!L)
return FALSE
+5 -5
View File
@@ -53,11 +53,11 @@ handles linking back and forth.
/datum/component/remote_materials/proc/_MakeLocal()
silo = null
mat_container = parent.AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
local_size,
FALSE,
/obj/item/stack)
// GS13 calorite
mat_container = parent.AddComponent(/datum/component/material_container, list(
MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA,
MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
local_size, FALSE, /obj/item/stack)
/datum/component/remote_materials/proc/set_local_size(size)
local_size = size
@@ -16,7 +16,7 @@ Bonus
//////////////////////////////////////
*/
/datum/symptom/weight_loss
/datum/symptom/weight_loss // GS13
name = "Weight Loss"
desc = "The virus mutates the host's metabolism, making it almost unable to gain nutrition from food."
@@ -33,13 +33,13 @@ Bonus
"Stealth 4" = "The symptom is less noticeable."
)
/datum/symptom/weight_loss/Start(datum/disease/advance/A)
/datum/symptom/weight_loss/Start(datum/disease/advance/A) // GS13
if(!..())
return
if(A.properties["stealth"] >= 4) //warn less often
base_message_chance = 25
/datum/symptom/weight_loss/Activate(datum/disease/advance/A)
/datum/symptom/weight_loss/Activate(datum/disease/advance/A) // GS13
if(!..())
return
var/mob/living/carbon/M = A.affected_mob
@@ -53,7 +53,7 @@ Bonus
M.nutrition = max(M.nutrition - 100, 0)
M.adjust_fatness(-30, FATTENING_TYPE_WEIGHT_LOSS)
/datum/symptom/weight_gain
/datum/symptom/weight_gain // GS13
name = "Weight Gain"
desc = "The virus mutates and merges itself with the host's adipocytes, allowing them to perform a form of mitosis and replicate on their own."
stealth = -3
@@ -71,7 +71,7 @@ Bonus
)
/datum/symptom/weight_gain/Activate(datum/disease/advance/A)
/datum/symptom/weight_gain/Activate(datum/disease/advance/A) // GS13
if(!..())
return
var/mob/living/carbon/M = A.affected_mob
+2 -2
View File
@@ -1,9 +1,9 @@
//nutrition
/datum/mood_event/fat_bad
/datum/mood_event/fat_bad // GS13
description = "<span class='warning'><B>I'm so fat...</B></span>\n"
mood_change = -4
/datum/mood_event/fat_good
/datum/mood_event/fat_good // GS13
description = "<span class='nicegreen'><B>I'm so fat!</B></span>\n"
mood_change = 4
+1 -1
View File
@@ -340,7 +340,7 @@
cost = 0
always_place = TRUE
/datum/map_template/ruin/space/biodome/beach
/datum/map_template/ruin/space/biodome/beach // GS13
name = "Biodome Beach"
id = "biodome-beach"
description = "Seemingly plucked from a tropical destination, this beach is calm and cool, with the salty waves roaring softly in the background. \
+5 -4
View File
@@ -288,6 +288,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
var/specific = null
medical_record_text = "During physical examination, patient was found to have a prosthetic limb."
// GS13: Allow multiple specific prosthetic limbs
/datum/quirk/prosthetic_limb/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/limb_slot = null
@@ -333,22 +334,22 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
Additionally, you need to use a welding tool and cables to repair it, \
instead of bruise packs and ointment.</span>")
/datum/quirk/prosthetic_limb/left_arm
/datum/quirk/prosthetic_limb/left_arm // GS13
name = "Prosthetic Limb (Left Arm)"
desc = "An accident caused you to lose your left arm. Because of this, it's replaced with a prosthetic!"
specific = BODY_ZONE_L_ARM
/datum/quirk/prosthetic_limb/right_arm
/datum/quirk/prosthetic_limb/right_arm // GS13
name = "Prosthetic Limb (Right Arm)"
desc = "An accident caused you to lose your right arm. Because of this, it's replaced with a prosthetic!"
specific = BODY_ZONE_R_ARM
/datum/quirk/prosthetic_limb/left_leg
/datum/quirk/prosthetic_limb/left_leg // GS13
name = "Prosthetic Limb (Left Leg)"
desc = "An accident caused you to lose your left leg. Because of this, it's replaced with a prosthetic!"
specific = BODY_ZONE_L_LEG
/datum/quirk/prosthetic_limb/right_leg
/datum/quirk/prosthetic_limb/right_leg // GS13
name = "Prosthetic Limb (Right Leg)"
desc = "An accident caused you to lose your right leg. Because of this, it's replaced with a prosthetic!"
specific = BODY_ZONE_R_LEG