New Map Mining (#1935)

* Alpha Commit

* Alpha Commit

* Seconds

* Some Commit

* Final Commit

* Fixing minedrone synth ID

* Dance Fever

* Fixing Travis part 1

* Satisfying the demands

* Stuff

* Sub-final commit

* Sculpting update

* more sculpting. pr is 99% sculpting, in fact

* kkk

* brightness_off

* swjaugyuwvhuw
This commit is contained in:
LordFowl
2017-03-22 18:14:37 -04:00
committed by GitHub
parent a2fbcaa18b
commit 3c64b62c27
128 changed files with 3734 additions and 1079 deletions
+11
View File
@@ -107,6 +107,17 @@
add_inherent_law("Prevent unplanned damage to your assigned vessel wherever possible.")
..()
/datum/ai_laws/mining_drone
name = "Mining Protocols"
law_header = "Prime Directives of Industry:"
/datum/ai_laws/mining_drone/New()
src.add_inherent_law("Serve and obey all [company_name] supply department personnel, with priority according to their rank and role.")
src.add_inherent_law("Protect all [company_name] supply department personnel to the best of your abilities, with priority according to their rank and role.")
src.add_inherent_law("Preserve your own existence and prevent yourself from coming to harm, so long as doing such does not conflict with any above laws.")
src.add_inherent_law("In absence of any proper instruction, your primary objective is to excavate and collect ore.")
..()
/******************** T.Y.R.A.N.T. ********************/
/datum/ai_laws/tyrant
name = "T.Y.R.A.N.T."
+17 -17
View File
@@ -39,10 +39,26 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/grenade/chem_grenade/incendiary)
cost = 20
containertype = /obj/structure/closet/crate
containername = "Special Ops crate"
containername = "crate"
group = "Security"
hidden = 1
/datum/supply_packs/randomised/illegalguns
name = "Illegal weapons crate"
num_contained = 2
contains = list(/obj/item/weapon/gun/projectile/automatic/mini_uzi,
/obj/item/weapon/gun/projectile/boltaction,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/weapon/gun/projectile/revolver/derringer,
/obj/item/weapon/gun/projectile/dragunov,
/obj/item/weapon/gun/energy/retro)
cost = 60
containertype = /obj/structure/closet/crate
containername = "crate"
hidden = 1
group = "Security"
/datum/supply_packs/forensics
name = "Auxiliary forensic tools"
contains = list(/obj/item/weapon/forensics/sample_kit,
@@ -1698,22 +1714,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "glowsticks crate"
group = "Operations"
/datum/supply_packs/randomised/illegalguns
name = "Illegal weapons crate"
num_contained = 2
contains = list(/obj/item/weapon/gun/projectile/automatic/mini_uzi,
/obj/item/weapon/gun/projectile/boltaction,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/weapon/gun/projectile/revolver/derringer,
/obj/item/weapon/gun/projectile/dragunov,
/obj/item/weapon/gun/energy/retro)
cost = 120
containertype = /obj/structure/closet/crate
containername = "Unlabeled crate"
contraband = 1
group = "Security"
/datum/supply_packs/spessbike
name = "Space-bike Crate"
contains = list(/obj/vehicle/bike)