5614 Commits

Author	SHA1	Message	Date
AffectedArc07	90fd9a8fb8	Removes all relative heresy (#13969) ... Removes all relative heresy	2020-09-16 12:52:20 -04:00
SteelSlayer	dab29cc668	Merge remote-tracking branch 'upstream/master' into spawn-removal	2020-09-16 09:38:20 -05:00
Kyep	7b78232276	Reworks Baseball Bat (#14186) ... * Adjusts baseball bat Co-authored-by: Kyep <Kyep@users.noreply.github.com>	2020-09-16 10:16:21 -04:00
SabreML	dd326096c9	Allows toy E-Swords to reflect Laser Tag lasers (#14191) ... * Allows toy eswords to reflect laser tag lasers	2020-09-16 10:13:32 -04:00
ppi13	0b23e89fa5	Balances the safety override module and Fixes #14172 (#14177) ... * Change safety override tech requirement and make it only unlock weapons instead of having the same effect as emag	2020-09-16 10:06:49 -04:00
joep van der velden	0bfe9d994e	Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co	2020-09-16 15:26:19 +02:00
variableundefined	a6d6d0591d	Merge pull request #13489 from AzuleUtama/uplinkBundleTweaks ... Improves Hacker and Payday uplink bundles	2020-09-16 09:02:54 -04:00
variableundefined	db06596ffa	Merge pull request #14283 from SabreML/Fire-Lighting ... Makes cigarettes catch fire if their holder is also on fire	2020-09-15 19:41:02 -04:00
Kyep	995a7c66e5	Fixes AI being unable to change radio settings	2020-09-15 11:13:10 -07:00
AffectedArc07	c39e00d7fc	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14059	2020-09-15 17:16:57 +01:00
Kyep	28d915b26f	fixes merge conflict	2020-09-15 08:40:03 -07:00
AffectedArc07	e12701c453	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14022	2020-09-15 16:23:11 +01:00
variableundefined	3a3ff1400a	Merge pull request #13447 from EMPlight/BulldogXLmag ... Adds Bulldog extended drum mags and bundle for nuke ops.	2020-09-14 16:45:04 -04:00
mochi	b05eded1d8	Merge branch 'master' into instrument-tgui-n-optimization	2020-09-14 22:13:04 +02:00
variableundefined	f5b7554c1a	Merge pull request #12851 from SteelSlayer/internals-auto-push-up ... Activating internals automatically pushes breath masks into place	2020-09-14 16:02:45 -04:00
mochi	e07306f20d	Merge branch 'master' into instrument-tgui-n-optimization	2020-09-14 20:04:48 +02:00
SteelSlayer	6caf4cfebf	Merge remote-tracking branch 'upstream/master' into wires-tgui	2020-09-14 08:51:32 -05:00
AffectedArc07	a2c5fc39a8	Merge pull request #13751 from Fox-McCloud/alarm-overhaul ... Overhauls and Refactors Alarm System	2020-09-14 13:54:06 +01:00
AffectedArc07	706dc6e3c6	Merge pull request #14233 from RedWolfie/chameleon ... chameleon flag fix	2020-09-12 23:45:09 +01:00
SabreML	3aea152a93	Fixes ... Changed 'Your' to 'The', since it's a 'visible_message'. Also removed implied src	2020-09-12 16:43:39 +01:00
SabreML	af2ea50764	Cigarettes catch fire	2020-09-12 15:38:57 +01:00
joep van der velden	062f275b6c	On tray not cyb tray	2020-09-12 10:34:31 +02:00
joep van der velden	5244b49e4e	Revert the . = ..()	2020-09-12 10:28:01 +02:00
joep van der velden	33f1353126	cyborg trays drop stuff upon death. NAD disallowed	2020-09-12 10:24:12 +02:00
Kugamo	b6ad29a1ec	fixes oversight, that made some scanned objects appear solid	2020-09-08 11:42:21 -05:00
AffectedArc07	7ee337b9e6	Merge pull request #14259 from RedWolfie/blind-weld ... Fixes some messages	2020-09-08 12:01:23 +01:00
Certhic	77258b9b0c	fixes garrote typo	2020-09-07 20:59:36 +02:00
Certhic	070904dd7b	smoke bomb runtime fix	2020-09-06 12:16:05 +02:00
Certhic	720a16e7e1	replaced spawn with addtimer	2020-09-06 12:15:50 +02:00
Certhic	dd8740d3df	chameleon flag fix	2020-09-04 13:47:16 +02:00
Kugamo	e0a7889e75	Adds inhand sprites, makes naming more consistant	2020-09-02 05:49:05 -05:00
AffectedArc07	75bbf7a6d5	Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets ... Inhand sprites for cigarette packets	2020-09-02 11:04:41 +01:00
AffectedArc07	b00304ebf1	Merge pull request #14209 from denghis1/plastic_create_cone ... Feature: Make warning cone craftable	2020-09-02 11:00:51 +01:00
AffectedArc07	35682a8e20	Merge pull request #14210 from RedWolfie/crayon ... [Bugfix] Orange cables	2020-09-02 11:00:23 +01:00
Certhic	916d358ad3	replaced some magic values	2020-09-01 16:26:25 +02:00
Certhic	90ac9874b2	fixed orange crayons not making cables orange	2020-09-01 16:23:53 +02:00
denghis1	7705a8c01a	Removed the crafting time of the warning cones ... Removed the crafting time of the warning cones, since it was so low anyway.	2020-09-01 16:07:49 +02:00
denghis1	451f1548a9	Made warning cones craftable ... Added warning cones to the global plastic_recipies list, this makes them craftable in-game.	2020-09-01 15:54:29 +02:00
variableundefined	c8c1800b57	Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks ... *more* Tcomms Tweaks	2020-08-31 16:05:05 -04:00
Kugamo	da45849334	splits up if statement into multiple lines	2020-08-30 15:43:23 -05:00
Kugamo	c340e71999	ok this is the best solution ... A single if statement, how elegant	2020-08-29 19:07:55 -05:00
Kugamo	702fbbfdb3	this is acutally is a better fix ... my first commit didnt account for the possibility that the revealed item could be destroyed, this way also eliminates another if statement. BUT it still goes through the full cycle for the objects(they still appear translucent for a time)	2020-08-29 19:03:27 -05:00
Kugamo	811dd2c454	fix	2020-08-29 18:31:21 -05:00
AffectedArc07	ebba3a322b	Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor ... TG Flying+Floating Refactor	2020-08-27 20:08:35 +01:00
SteelSlayer	6e641db3fe	Merge remote-tracking branch 'upstream/master' into internals-auto-push-up	2020-08-25 16:39:08 -05:00
SteelSlayer	1b9ef55246	Merge remote-tracking branch 'upstream/master' into wires-tgui	2020-08-25 16:36:13 -05:00
AffectedArc07	3fb3353bc8	Merge pull request #14068 from ExusA/Spray-Fix ... Hydroponics Spray Fix	2020-08-19 11:18:33 +01:00
ExusA	c1756fe7e3	Update code/game/objects/items/weapons/storage/belt.dm ... Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>	2020-08-19 18:09:13 +08:00
AffectedArc07	ce0eb1fbdc	Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order ... Fix colored lips drawing over masks and random lipstick colouring	2020-08-19 10:46:04 +01:00
mochi	346b54ad26	Fix random lipstick colour always defaulting to white	2020-08-19 10:20:14 +02:00