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
b05eded1d8
Merge branch 'master' into instrument-tgui-n-optimization
2020-09-14 22:13:04 +02:00
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
e07306f20d
Merge branch 'master' into instrument-tgui-n-optimization
2020-09-14 20:04:48 +02:00
6caf4cfebf
Merge remote-tracking branch 'upstream/master' into wires-tgui
2020-09-14 08:51:32 -05:00
a2c5fc39a8
Merge pull request #13751 from Fox-McCloud/alarm-overhaul
...
Overhauls and Refactors Alarm System
2020-09-14 13:54:06 +01:00
706dc6e3c6
Merge pull request #14233 from RedWolfie/chameleon
...
chameleon flag fix
2020-09-12 23:45:09 +01:00
062f275b6c
On tray not cyb tray
2020-09-12 10:34:31 +02:00
5244b49e4e
Revert the . = ..()
2020-09-12 10:28:01 +02:00
33f1353126
cyborg trays drop stuff upon death. NAD disallowed
2020-09-12 10:24:12 +02:00
b6ad29a1ec
fixes oversight, that made some scanned objects appear solid
2020-09-08 11:42:21 -05:00
7ee337b9e6
Merge pull request #14259 from RedWolfie/blind-weld
...
Fixes some messages
2020-09-08 12:01:23 +01:00
77258b9b0c
fixes garrote typo
2020-09-07 20:59:36 +02:00
070904dd7b
smoke bomb runtime fix
2020-09-06 12:16:05 +02:00
720a16e7e1
replaced spawn with addtimer
2020-09-06 12:15:50 +02:00
dd8740d3df
chameleon flag fix
2020-09-04 13:47:16 +02:00
e0a7889e75
Adds inhand sprites, makes naming more consistant
2020-09-02 05:49:05 -05:00
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
b00304ebf1
Merge pull request #14209 from denghis1/plastic_create_cone
...
Feature: Make warning cone craftable
2020-09-02 11:00:51 +01:00
35682a8e20
Merge pull request #14210 from RedWolfie/crayon
...
[Bugfix] Orange cables
2020-09-02 11:00:23 +01:00
916d358ad3
replaced some magic values
2020-09-01 16:26:25 +02:00
90ac9874b2
fixed orange crayons not making cables orange
2020-09-01 16:23:53 +02:00
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
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
c8c1800b57
Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks
...
*more* Tcomms Tweaks
2020-08-31 16:05:05 -04:00
da45849334
splits up if statement into multiple lines
2020-08-30 15:43:23 -05:00
c340e71999
ok this is the best solution
...
A single if statement, how elegant
2020-08-29 19:07:55 -05:00
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
811dd2c454
fix
2020-08-29 18:31:21 -05:00
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
6e641db3fe
Merge remote-tracking branch 'upstream/master' into internals-auto-push-up
2020-08-25 16:39:08 -05:00
1b9ef55246
Merge remote-tracking branch 'upstream/master' into wires-tgui
2020-08-25 16:36:13 -05:00
3fb3353bc8
Merge pull request #14068 from ExusA/Spray-Fix
...
Hydroponics Spray Fix
2020-08-19 11:18:33 +01:00
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
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
346b54ad26
Fix random lipstick colour always defaulting to white
2020-08-19 10:20:14 +02:00
9f62b5534b
fixes indentation and duplicate code
2020-08-18 22:21:25 +08:00
5037e43341
Merge pull request #14073 from ExusA/toy-descs
...
Adds Figurine Descriptions
2020-08-18 13:01:34 +01:00
233c60058d
Merge pull request #13710 from dearmochi/overhaul-event-mob-selection
...
Overhaul event mob selection
2020-08-18 10:55:24 +01:00
69cd58c1df
Merge pull request #13934 from SabreML/Maint-Drone-Stuff
...
Maintenance Drone Tweaks
2020-08-17 13:35:59 +01:00
2d1ba4ab56
Merge pull request #14005 from dearmochi/baton-refactor
...
Telebaton fix, refactor and documentation
2020-08-16 20:08:33 +01:00
f65e8f1d7f
Merge pull request #13899 from dearmochi/flashbang-light-vfx
...
Update flashbang FX and code clean-up
2020-08-16 20:00:48 +01:00
f0dc996149
Update belt.dm
2020-08-16 23:50:30 +08:00
9401458416
actually what i meant to submit
2020-08-16 21:53:46 +08:00
07301da5d2
Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob
...
ID Computer Demotion/Termination Upgrades
2020-08-16 13:14:42 +01:00
40f5e0ecd6
references the new sprites
2020-08-15 23:07:10 -05:00
d7a479e879
Adds many inhand sprites for cigpacks and animates lighers
2020-08-15 23:06:37 -05:00
609d252fa8
Merge remote-tracking branch 'upstream/master' into wires-tgui
2020-08-15 13:13:50 -05:00
abbb1e05fb
Update toys.dm
2020-08-13 16:16:36 +08:00
addb0c1a26
Update belt.dm
2020-08-13 15:00:49 +08:00
variableundefined