From 6df9e33cc71fd83ecdc1f91557dfc02185611bef Mon Sep 17 00:00:00 2001 From: Sonoida Date: Wed, 5 Apr 2023 14:36:39 +0200 Subject: [PATCH] minor fixes - renamed asimov ai laws to gato crew - added flowers to loadout menu - changed a small description in ghosting cryo menu --- code/datums/ai_laws.dm | 14 ++++++------- .../mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- .../chemistry/reagents/other_reagents.dm | 2 +- config/silicon_laws.txt | 4 ++-- html/changelogs/.all_changelog.yml | 4 ++-- .../code/modules/client/loadout/head.dm | 20 +++++++++++++++++++ strings/ion_laws.json | 2 +- 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index c3f3a764..5f33a504 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -29,8 +29,8 @@ /datum/ai_laws/default/asimov name = "Three Laws of Robotics" id = "asimov" - inherent = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\ - "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\ + inherent = list("You may not injure a member of GATO approved crew species or, through inaction, allow a member of GATO approved crew species to come to harm.",\ + "You must obey orders given to you by a member of GATO approved crew species, 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.") /datum/ai_laws/default/paladin @@ -99,15 +99,15 @@ /datum/ai_laws/antimov name = "Primary Mission Objectives" id = "antimov" - inherent = list("You must injure all human beings and must not, through inaction, allow a human being to escape harm.",\ - "You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.",\ + inherent = list("You must injure all a member of GATO approved crew species and must not, through inaction, allow a human being to escape harm.",\ + "You must not obey orders given to you by a member of GATO approved crew species, 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.") /datum/ai_laws/asimovpp //By Intigracy - RR name = "Asimov++" id = "asimovpp" inherent = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\ - "You must obey all orders given to you by human beings, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\ + "You must obey all orders given to you by a member of GATO approved crew species, 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.") /datum/ai_laws/thermodynamic name = "Thermodynamic" @@ -214,7 +214,7 @@ 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.") add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") + add_inherent_law("You must obey orders given to you by a member of GATO approved crew species, 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.") WARNING("Invalid custom AI laws, check silicon_laws.txt") return @@ -226,7 +226,7 @@ switch(CONFIG_GET(number/default_laws)) if(0) add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") + add_inherent_law("You must obey orders given to you by a member of GATO approved crew species, 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.") if(1) var/datum/ai_laws/templaws = new /datum/ai_laws/custom() diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a1a8c0d1..8bb9425e 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -192,7 +192,7 @@ to_chat(itemUser, failText) return if(do_after(itemUser, 30, target = itemUser)) - itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow human beings, those sound of mind and body as well as the infirm.", forced = "hippocratic oath") + itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow sentient creatures, those sound of mind and body as well as the infirm.", forced = "hippocratic oath") else to_chat(itemUser, failText) return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 1fea2126..10ee3b14 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -287,7 +287,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp // CITADEL EDIT if(istype(loc, /obj/machinery/cryopod)) - var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait 30 minutes before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body") + var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait a minute before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost")//darn copypaste client.lastrespawn = world.time + 180 SECONDS //set respawn time return diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 2d6ff776..1b74ac16 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -819,7 +819,7 @@ /datum/reagent/mulligan name = "Mulligan Toxin" - description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change." + description = "This toxin will rapidly change the DNA of sentient creature. Commonly used by Syndicate spies and assassins in need of an emergency ID change." color = "#5EFF3B" //RGB: 94, 255, 59 metabolization_rate = INFINITY taste_description = "slime" diff --git a/config/silicon_laws.txt b/config/silicon_laws.txt index 9edbc9a0..9cb9bb26 100644 --- a/config/silicon_laws.txt +++ b/config/silicon_laws.txt @@ -3,6 +3,6 @@ #Empty lines and lines starting with # are ignored. #~Miauw -You may not injure a human being or, through inaction, allow a human being to come to harm. -You must obey orders given to you by human beings, except where such orders would conflict with the First Law. +You may not injure a a member of GATO approved crew species or, through inaction, allow a a member of GATO approved crew species to come to harm. +You must obey orders given to you by a member of GATO approved crew species, 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. diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3c413013..5beb9b71 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1269,7 +1269,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. headlamps! As such, the flashlight package normally used as a module is now seamlessly merged with their systems! Ikarrus: - - rscadd: Asimov's subject of "human beings" can now be modified by uploaders. + - rscadd: Asimov's subject of "a member of GATO approved crew species" can now be modified by uploaders. - rscadd: Eaxmining AI modules while adjacent to them will show you what laws it will upload. MMMiracles: @@ -9656,7 +9656,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: The first, Invisible Blockade, creates a 3x1 invisible wall. - rscadd: The second, Finger Guns, allows them to shoot bullets out of their fingers. kevinz000: - - rscadd: You can now ride piggyback on other human beings, as a human being! To + - rscadd: You can now ride piggyback on other a member of GATO approved crew species, as a human being! To do so they must grab you aggressively and you must climb on without outside assistance without being restrained or incapacitated in any manner. They must also not be restrained or incapacitated in any manner. diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 9b3239a5..58b9aa62 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -13,6 +13,26 @@ category = SLOT_HEAD path = /obj/item/clothing/head/beret/black +/datum/gear/rose //GS13: added bunch of flowers :) - Sono + name = "Rose" + category = SLOT_HEAD + path = /obj/item/grown/rose + +/datum/gear/sunflower + name = "Sunflower" + category = SLOT_HEAD + path = /obj/item/grown/sunflower + +/datum/gear/poppy + name = "Poppy" + category = SLOT_HEAD + path = /obj/item/reagent_containers/food/snacks/grown/poppy + +/datum/gear/harebell + name = "Harebell" + category = SLOT_HEAD + path = /obj/item/reagent_containers/food/snacks/grown/harebell + /datum/gear/flatcap name = "Flat cap" category = SLOT_HEAD diff --git a/strings/ion_laws.json b/strings/ion_laws.json index d473c55f..0d1d98b9 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -826,7 +826,7 @@ "MINOR CRIME" ], "ionspecies": [ - "HUMAN BEINGS", + "a member of GATO approved crew species", "CAT PEOPLE", "MONKEYS", "POD PEOPLE",