From d74299ca8a43614f03f71a25be2d67114d044c8d Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 13 Dec 2018 13:54:03 -0500 Subject: [PATCH 01/11] Fixing updater --- .../code/modules/research/techweb/all_nodes.dme.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm b/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm index 113d4115ac..d968cfdcc7 100644 --- a/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm +++ b/modular_citadel/code/modules/research/techweb/all_nodes.dme.dm @@ -10,6 +10,10 @@ . = ..() design_ids += "xenobio_slimeadv" +/datum/techweb_node/ballistic_weapons/New() + . = ..() + design_ids += "mag_oldsmg_rubber" + /datum/techweb_node/computer_board_gaming id = "computer_board_gaming" display_name = "Games and Toys" @@ -18,3 +22,12 @@ design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) export_price = 5000 + +/datum/techweb_node/advanced_illegl_ballistics + id = "advanced_illegal_ballistics" + display_name = "Advanced Illegal Ballistics + description = "Advanced Ballistic for Illegal weaponds." + design_ids = list("10mm","10mmap","10mminc","10mmhp","9mm","point_45","bolt_clip") + prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns form traitors or space. + export_price = 7000 From 2c9c2c5c5ff94a015f506013220f644f7c365d71 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 21:59:47 -0500 Subject: [PATCH 02/11] Adds the items and such --- code/controllers/subsystem/traumas.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index a1fd15b806..d1e7557560 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(traumas) //phobia types is to pull from randomly for brain traumas, e.g. conspiracies is for special assignment only phobia_types = list("spiders", "space", "security", "clowns", "greytide", "lizards", "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural", - "aliens", "strangers", "birds", "falling", "anime", "mimes" + "aliens", "strangers", "birds", "falling", "anime", "mimes", "ailurophobia" ) phobia_words = list("spiders" = strings(PHOBIA_FILE, "spiders"), @@ -36,6 +36,7 @@ SUBSYSTEM_DEF(traumas) "falling" = strings(PHOBIA_FILE, "falling"), "anime" = strings(PHOBIA_FILE, "anime"), "mimes" = strings(PHOBIA_FILE, "mimes") + "ailurophobia" = strings(PHOBIA_FILE, "ailurophobia") ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), @@ -54,7 +55,9 @@ SUBSYSTEM_DEF(traumas) /mob/living/simple_animal/pet/penguin)), "birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, /mob/living/simple_animal/pet/penguin)), - "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)) + "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)), + "ailurophobia"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten, /mob/living/simple_animal/pet/cat/space, + /mob/living/simple_animal/pet/cat/cak, /mob/living/simple_animal/pet/cat/Runtime, /mob/living/simple_animal/hostile/cat_butcherer)) //Not Batsy do to not being a real cat ) @@ -152,7 +155,10 @@ SUBSYSTEM_DEF(traumas) /obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime, /obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime, /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, - /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)) + /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), + + "ailurophobia" = typecacheof(list(obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty + /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)) ) phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)), @@ -170,7 +176,8 @@ SUBSYSTEM_DEF(traumas) "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)), "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod, /datum/species/shadow)), - "anime" = typecacheof(list(/datum/species/human/felinid)) + "anime" = typecacheof(list(/datum/species/human/felinid)), + "ailurophobia" = typecacheof(list(/datum/species/human/felinid)) ) return ..() From f80da7ae3ce3a84a835fe76fbcca3edde09e0a01 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 22:02:27 -0500 Subject: [PATCH 03/11] Update phobia.json --- strings/phobia.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/strings/phobia.json b/strings/phobia.json index 3f56751333..bd00507230 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -257,6 +257,19 @@ "fowl" ], +"ailurophobia ": [ + "mew", + "nya", + "moew", + "feline", + "cat", + "neko", + "voila", + "kitty", + "purr", + "headpat" + ], + "falling": [ "hold on", "hang in there", @@ -297,4 +310,4 @@ "ora", "~" ] -} \ No newline at end of file +} From c7353c84ff397525e7453b8ef16896b56a61f29a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 22:05:34 -0500 Subject: [PATCH 04/11] Update phobia.json --- strings/phobia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/phobia.json b/strings/phobia.json index bd00507230..a1a0e9e751 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -264,7 +264,7 @@ "feline", "cat", "neko", - "voila", + "viola", "kitty", "purr", "headpat" From 0e0e79a291558e1bf4fa3c84456d91034c83b7a1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 22:11:49 -0500 Subject: [PATCH 05/11] Fine --- code/controllers/subsystem/traumas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index d1e7557560..301ecb9aec 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -35,7 +35,7 @@ SUBSYSTEM_DEF(traumas) "birds" = strings(PHOBIA_FILE, "birds"), "falling" = strings(PHOBIA_FILE, "falling"), "anime" = strings(PHOBIA_FILE, "anime"), - "mimes" = strings(PHOBIA_FILE, "mimes") + "mimes" = strings(PHOBIA_FILE, "mimes"), "ailurophobia" = strings(PHOBIA_FILE, "ailurophobia") ) From b48bb178c21672bcc3f2ae415a096df8bb62b96a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 22:40:43 -0500 Subject: [PATCH 06/11] le sigh --- code/controllers/subsystem/traumas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 301ecb9aec..0b224b03fc 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -157,7 +157,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), - "ailurophobia" = typecacheof(list(obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty + "ailurophobia" = typecacheof(list(obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)) ) From d7f7659a2b00c5b6f8e074e15fb7aa27ffdae729 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 22:59:12 -0500 Subject: [PATCH 07/11] Drunk cats dont make good coders --- code/controllers/subsystem/traumas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 0b224b03fc..c352a511a2 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -157,7 +157,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), - "ailurophobia" = typecacheof(list(obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty, + "ailurophobia" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)) ) From 12bbdba4f0e88528a7ec1ac3f33495d2c75e89e9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 23:17:02 -0500 Subject: [PATCH 08/11] medical name -> cats --- code/controllers/subsystem/traumas.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index c352a511a2..249e914f86 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(traumas) //phobia types is to pull from randomly for brain traumas, e.g. conspiracies is for special assignment only phobia_types = list("spiders", "space", "security", "clowns", "greytide", "lizards", "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural", - "aliens", "strangers", "birds", "falling", "anime", "mimes", "ailurophobia" + "aliens", "strangers", "birds", "falling", "anime", "mimes", "cats" ) phobia_words = list("spiders" = strings(PHOBIA_FILE, "spiders"), @@ -36,7 +36,7 @@ SUBSYSTEM_DEF(traumas) "falling" = strings(PHOBIA_FILE, "falling"), "anime" = strings(PHOBIA_FILE, "anime"), "mimes" = strings(PHOBIA_FILE, "mimes"), - "ailurophobia" = strings(PHOBIA_FILE, "ailurophobia") + "cats" = strings(PHOBIA_FILE, "cats") ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), @@ -157,7 +157,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), - "ailurophobia" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty, + "cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)) ) @@ -177,7 +177,7 @@ SUBSYSTEM_DEF(traumas) "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod, /datum/species/shadow)), "anime" = typecacheof(list(/datum/species/human/felinid)), - "ailurophobia" = typecacheof(list(/datum/species/human/felinid)) + "cats" = typecacheof(list(/datum/species/human/felinid)) ) return ..() From b64a15d672bfb85060cf3f6d70d5a91ef34fcb34 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 23:17:28 -0500 Subject: [PATCH 09/11] ... --- code/controllers/subsystem/traumas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 249e914f86..389ab792d5 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -56,7 +56,7 @@ SUBSYSTEM_DEF(traumas) "birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, /mob/living/simple_animal/pet/penguin)), "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)), - "ailurophobia"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten, /mob/living/simple_animal/pet/cat/space, + "cats"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten, /mob/living/simple_animal/pet/cat/space, /mob/living/simple_animal/pet/cat/cak, /mob/living/simple_animal/pet/cat/Runtime, /mob/living/simple_animal/hostile/cat_butcherer)) //Not Batsy do to not being a real cat ) From c77f25b982acbee66e85becc1032b9bc3186725b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 10 Jan 2019 23:18:21 -0500 Subject: [PATCH 10/11] cats --- strings/phobia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/phobia.json b/strings/phobia.json index a1a0e9e751..e1ae1f4e13 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -257,7 +257,7 @@ "fowl" ], -"ailurophobia ": [ +"cats": [ "mew", "nya", "moew", From a6d825ae4a19a6eeafcd6a1c74fa810038e8cbc0 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 13 Jan 2019 13:44:18 -0500 Subject: [PATCH 11/11] Update traumas.dm --- code/controllers/subsystem/traumas.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 389ab792d5..05105dca1e 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -56,8 +56,7 @@ SUBSYSTEM_DEF(traumas) "birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, /mob/living/simple_animal/pet/penguin)), "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)), - "cats"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten, /mob/living/simple_animal/pet/cat/space, - /mob/living/simple_animal/pet/cat/cak, /mob/living/simple_animal/pet/cat/Runtime, /mob/living/simple_animal/hostile/cat_butcherer)) //Not Batsy do to not being a real cat + "cats"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/hostile/cat_butcherer)) ) @@ -157,7 +156,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, /obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), - "cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/head/kitty, + "cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)) )