cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 23:47:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

quick patches

Browse Source 
stuff I forgot about or fucked up
This commit is contained in:
Sonoida
2023-04-06 16:43:56 +02:00
parent a589336b0a
commit 090cf0780b
5 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/alert.dm
+2 -2
View File
@@ -185,7 +185,7 @@
/obj/screen/alert/veryfat
name = "Very fat"
desc = "You're beginning to inch closer and closer to proper obesity. The way your thighs rub against each and the rumble your stomach produces suggests that you won't remain in this state for long..."
desc = "You're beginning to inch closer and closer to proper obesity. The way your thighs rub against each and the rumbles your stomach produces suggests that you won't remain in this state for long..."
icon_state = "veryfat"
/obj/screen/alert/fatter
@@ -195,7 +195,7 @@
/obj/screen/alert/fat
name = "Rounded"
desc = "Your body's beginning to display the first signes of softened curves, though they're barely noticeable."
desc = "Your body's beginning to display the first signs of softened curves, though they're barely noticeable."
icon_state = "fat"
code/datums/ai_laws.dm
+10 -10
View File
@@ -29,8 +29,8 @@
/datum/ai_laws/default/asimov
name = "Three Laws of Robotics"
id = "asimov"
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.",\
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.")
/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 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.",\
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.")
/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 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.",\
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.")
/datum/ai_laws/thermodynamic
name = "Thermodynamic"
@@ -213,8 +213,8 @@
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.")
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 a member of GATO approved crew species, except where such orders would conflict with the First Law.")
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.")
WARNING("Invalid custom AI laws, check silicon_laws.txt")
return
@@ -225,8 +225,8 @@
var/list/law_ids = CONFIG_GET(keyed_list/random_laws)
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 a member of GATO approved crew species, except where such orders would conflict with the First Law.")
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.")
if(1)
var/datum/ai_laws/templaws = new /datum/ai_laws/custom()
code/modules/mob/living/carbon/human/examine.dm
+17
View File
@@ -256,14 +256,31 @@
if(nutrition < NUTRITION_LEVEL_STARVING - 50)
msg += "[t_He] [t_is] severely malnourished.\n"
if(fatness >= FATNESS_LEVEL_BLOB)
msg += "[t_He] [t_is] completely engulfed in rolls upon rolls of flab. [t_His] head is poking out on top of [t_His] body, akin to a marble on top of a hill.\n"
else if(fatness >= FATNESS_LEVEL_IMMOBILE)
msg += "[t_His] body is buried in an overflowing surplus of adipose, and [t_His] legs are completely buried beneath layers of meaty, obese flesh.\n"
else if(fatness >= FATNESS_LEVEL_BARELYMOBILE)
msg += "[t_He] [t_is] as wide as [t_He] [t_is] tall, barely able to move [t_His] masssive body that seems to be overtaken with piles of flab.\n"
else if(fatness >= FATNESS_LEVEL_EXTREMELY_OBESE)
msg += "[t_He] [t_is] ripe with numerous rolls of fat, almost all of [t_His] body layered with adipose.\n"
else if(fatness >= FATNESS_LEVEL_MORBIDLY_OBESE)
msg += "[t_He] [t_is] utterly stuffed with abundant lard, [t_He] doesn't seem to be able to move much.\n"
else if(fatness >= FATNESS_LEVEL_OBESE)
msg += "[t_He] [t_is] engorged with fat, [t_His] body laden in rolls of fattened flesh.\n"
else if(fatness >= FATNESS_LEVEL_VERYFAT)
msg += "[t_He] [t_is] pleasantly plushy, [t_His] body gently wobbling whenever they move. \n"
else if(fatness >= FATNESS_LEVEL_FATTER)
msg += "[t_He] [t_is] soft and curvy, [t_His] belly looking like a small pillow.\n"
else if(fatness >= FATNESS_LEVEL_FAT)
if(user.nutrition < NUTRITION_LEVEL_STARVING - 50)
msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"