William Wallace
f2a2baef87
remove dupe /obj/item/clothing/head/collectable/slime
2019-10-09 01:15:16 +01:00
William Wallace
66202f3e2c
remove duplicate var definition in /obj/effect/proc_holder/spell/targeted/turf_teleport/blink/cult
2019-10-09 00:22:39 +01:00
William Wallace
74e069e43d
remove duplicate /obj/structure/fans/tiny/invisible
2019-10-09 00:21:04 +01:00
William Wallace
816b463487
remove duplicate /obj/screen/alert/status_effect/bloodchill
2019-10-09 00:20:20 +01:00
William Wallace
b492bb56a4
remove duplicate var definition in /datum/design/board/telecomms_server
2019-10-09 00:19:41 +01:00
William Wallace
6600d43ba9
remove duplicate /obj/item/reagent_containers/glass/bottle/formaldehyde
2019-10-09 00:18:43 +01:00
William Wallace
0e1bab0869
remove duplicate var definition in /obj/projectile/bullet/p50/penetrator
2019-10-09 00:17:56 +01:00
William Wallace
45f2feda3b
replace extra icon_state with item_state in /obj/item/gun/ballistic/rifle
2019-10-09 00:15:41 +01:00
William Wallace
076e532e65
remove duplicate var definitions in /obj/item/gun/magic
2019-10-09 00:13:11 +01:00
William Wallace
70acd2bc48
remove duplicate var definition from /obj/item/energy_katana
2019-10-09 00:11:55 +01:00
William Wallace
59fb7d3a4a
remove duplicate var definition in /mob/living/simple_animal/slime
2019-10-09 00:10:46 +01:00
William Wallace
6ea67b18f3
remove duplicate var definition in /mob/living/simple_animal/hostile/asteroid/goliath
2019-10-09 00:10:17 +01:00
William Wallace
7bd69f587b
remove duplicate var definition in /mob/living/simple_animal/hostile/asteroid/basilisk
2019-10-09 00:08:54 +01:00
William Wallace
5c240c87f3
remove duplicate var definition in /mob/living/simple_animal/hostile/lightgeist
2019-10-09 00:07:15 +01:00
William Wallace
65ba24d4fb
remove duplicate var definition in /mob/living/simple_animal/hostile/gorilla
2019-10-09 00:06:38 +01:00
William Wallace
a133637cab
remove duplicate var in /mob/living/simple_animal/hostile/asteroid/fugu
2019-10-09 00:05:41 +01:00
William Wallace
053b977885
remove duplicate var definition in /mob/living/simple_animal/hostile/tree
2019-10-09 00:02:22 +01:00
William Wallace
6643383305
remove duplicate var definition in /mob/living/simple_animal/hostile/netherworld
2019-10-08 23:57:58 +01:00
William Wallace
b8f97ba926
remove duplicate var definition in /mob/living/simple_animal/hostile/poison/giant_spider
2019-10-08 23:56:16 +01:00
William Wallace
d1486ae733
remove duplicate var definition in /mob/living/simple_animal/pet/penguin/emperor
2019-10-08 23:55:13 +01:00
William Wallace
174aa1d84c
remove duplicate var definition in /mob/living/simple_animal/shade
2019-10-08 23:52:20 +01:00
William Wallace
a59e8f2cf0
remove duplicate /datum/emote/silicon/chime definition
2019-10-08 23:48:47 +01:00
William Wallace
c00d457482
remove duplicate /datum/sprite_accessory/hair/bun2 &/datum/sprite_accessory/hair/bun3
2019-10-08 23:48:04 +01:00
William Wallace
b77030ff80
extra icon_state -> item_state on /obj/item/stack/ore/gold & /obj/item/stack/ore/glass/basalt
2019-10-08 23:43:28 +01:00
William Wallace
fff4e9aee5
remove duplicate var definition in /obj/structure/chisel_message
2019-10-08 23:39:44 +01:00
William Wallace
54bb2c05a9
remove dulpicate var definition in /obj/item/clothing/under/costume/russian_officer
2019-10-08 23:38:18 +01:00
William Wallace
69b62c9ea3
replace extra icon_state on /obj/item/clothing/suit/nemes with item_state
2019-10-08 23:36:26 +01:00
William Wallace
2efe7fb7d3
remove duplicate var on /obj/item/clothing/shoes/sandal
2019-10-08 23:35:44 +01:00
William Wallace
88945ad0c8
remove duplicate /obj/item/clothing/shoes/sneakers/brown
2019-10-08 23:35:14 +01:00
William Wallace
07deda90bf
replace extra icon_state on /obj/item/clothing/head/pharaoh with item_state
2019-10-08 23:34:41 +01:00
William Wallace
9c9ead64b2
remove duplicate /obj/item/clothing/head/flatcap
2019-10-08 23:32:27 +01:00
William Wallace
878a8e207e
remove duplicate var definition in /obj/item/clothing/head/helmet
2019-10-08 23:31:26 +01:00
William Wallace
53227eef49
remove duplicate var definition from /obj/machinery/portable_atmospherics/canister/proto/default
2019-10-08 23:26:25 +01:00
William Wallace
6d3211d7d3
merge duplicate /turf/open/floor/holofloor/asteroid definitions
2019-10-08 22:18:38 +01:00
skoglol
f977a09981
tiny supermatter cleanup ( #46928 )
2019-10-08 11:08:41 -04:00
Qustinnus
a394ccdc2b
Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) ( #46525 )
...
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)
this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.
also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Fikou
f265714416
grill wrench no longer attacks ( #46924 )
...
* fixes grill wrench
* Update code/modules/food_and_drinks/kitchen_machinery/grill.dm
Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com >
* a
* crr
2019-10-08 10:33:18 -04:00
oranges
4c0a8778be
Merge pull request #46926 from kriskog/drones
...
Drones no longer delete dropped items
2019-10-08 11:42:47 +13:00
Mickyan
7397fac01a
Clowns don't get along with rakes ( #46834 )
...
* deughrgh
* typo
* typo 2
2019-10-07 15:58:39 -04:00
kingofkosmos
71644568b5
Personal interaction messages to simple animals ( #46744 )
...
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.
* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.
* Small extra: Adds personal messages for gun firing.
* Adds personal messages to grabs and fixes shoe stealing messages.
* Fixes open someone else's internals valve pronoun.
* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02:00
carlarctg
d6210b95ce
Adds fireproof masks, and tweaks flameproof atmos clothing ( #46732 )
...
* the masks
* the startups
* more touchies
* whoops
* actually this is useless
* that's better
* i made a whoopsie boopsie
* bullying is not okay
* should stop coding at 2 am, but i am being a hypcrite now
2019-10-07 10:55:22 -04:00
spessbro
99d73dd330
New reactions a new reagent ( #46861 )
2019-10-06 19:38:57 -04:00
NikNakFlak
66f04e2ab8
PAI sunglasses can now be picked from the emote menu ( #46929 )
...
thanks oranges for the help
2019-10-07 11:31:22 +13:00
Kristian
781a3b4651
and simpleslimes
2019-10-06 22:54:24 +02:00
Kristian
c6b666ebce
Drones no longer delete dropped items.
2019-10-06 22:43:42 +02:00
Couls
67fe7e8951
refactor blindness code to have less copy paste ( #46729 )
...
* refactor blindness
* Update code/modules/mob/living/carbon/human/life.dm
Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com >
* make blind_eyes call adjust_blindness
* cure blind trait upon death
2019-10-06 21:57:21 +02:00
Tlaltecuhtli
64a6bd0413
fire damage by rads is log(rads) * 2 ( #46806 )
...
* fire damage by rads is capped to 15/pulse
* use log
* e
2019-10-06 21:37:30 +02:00
Bobbahbrown
02c5751e3c
Add galaxy lawyer suit ( #46860 )
...
Ports the corporate liaison galaxy suit from TGMC. Requested by
Grantteen. Object sprites by Twaticus.
Washing a lawyer suit with a bluespace crystal or a telecrystal will
dye the suit into an exciting galaxy suit variant. This also adds the
DYE_SYNDICATE dye key to telecrystals, could be used for future PRs.
2019-10-06 11:46:41 -07:00
nemvar
a148cae769
Kills obj/item/projectile in favour of obj/projectile ( #46692 )
...
* Kills obj/item/projectile in favour of obj/projectile
* Resolves conflicts properly
* fixes that one map
* it lives
2019-10-06 13:37:24 -04:00
ATH1909
9e6950888d
Advanced virus infection vector changes ( #46730 )
...
* Update advance.dm
* Update cough.dm
* Update cough.dm
* Update sneeze.dm
* Update disease_abilities.dm
* Update genetics.dm
* Update advance.dm
* Update sneeze.dm
* Update sneeze.dm
* Update cough.dm
* Update genetics.dm
* Update genetics.dm
2019-10-06 13:35:27 -04:00
