Merge pull request #7 from Citadel-Station-13/master

Updating
This commit is contained in:
Neri
2017-10-06 11:53:03 -07:00
committed by GitHub
5 changed files with 1056 additions and 266 deletions
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -175,17 +175,17 @@ AI MODULES
/******************** OneHuman ********************/
/obj/item/aiModule/zeroth/oneHuman
name = "'OneHuman' AI Module"
name = "'OneCrew' AI Module"
var/targetName = ""
origin_tech = "programming=4;materials=4"
laws = list("Only SUBJECT is human.")
laws = list("Only SUBJECT is crew.")
/obj/item/aiModule/zeroth/oneHuman/attack_self(mob/user)
var/targName = stripped_input(user, "Please enter the subject who is the only human.", "Who?", user.real_name,MAX_NAME_LEN)
var/targName = stripped_input(user, "Please enter the subject who is the only crew.", "Who?", user.real_name,MAX_NAME_LEN)
if(!targName)
return
targetName = targName
laws[1] = "Only [targetName] is human"
laws[1] = "Only [targetName] is crew"
..()
/obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user)
@@ -21,8 +21,8 @@
category = list("AI Modules")
/datum/design/board/onehuman_module
name = "Module Design (OneHuman)"
desc = "Allows for the construction of a OneHuman AI Module."
name = "Module Design (OneCrew)"
desc = "Allows for the construction of a OneCrew AI Module."
id = "onehuman_module"
req_tech = list("programming" = 6, "materials" = 4)
materials = list(MAT_GLASS = 1000, MAT_DIAMOND = 100)
@@ -0,0 +1,4 @@
author: "OneCrew"
delete-after: True
changes:
- tweak: "Renamed all the OneHuman text to OneCrew. OneCrew still has the same spawning ID so no map changes are required."
@@ -0,0 +1,5 @@
author: "deathride58"
delete-after: True
changes:
- rscadd: "Added a maintenance bar to Boxstation. It has a kinkmate. It has booze. It has a table for Dare Dice."
- rscadd: "Also added dorms to maintenance in the place of boxstation's default maint bar."