b3c28c36fa
Merge branch 'master' into upstream-merge-38649
2018-07-06 01:34:12 -04:00
8a269e3398
Add medical HUD icon if the body has died recently enough to be defibbed ( #38909 )
...
Health analyzers already will tell you this, so this just makes it easier. I
read this on the "Minor Suggestions" thread. I'm no spriter, so feel free to
tell me if my icon sucks. I had to add an "addtimer" to the death proc because
med_hud_set_status isn't called anymore after death.
2018-07-05 18:55:54 -05:00
1a2f82bdb9
Adds comments to _globals.dm ( #38893 )
...
"Help" "understanding"
2018-07-05 18:21:59 -05:00
0180039518
Adds a sprite for Glowcaps. ( #38908 )
2018-07-05 13:40:46 -05:00
624351076e
Update autodrobe.dm
...
Adds in more clothing for gimmicks or to look fancy! None of those outfits have any armor or usefulness other then to look good or cover your face if its a mask similar to the chicken hat
Why: These outfits look nice and have no real in-game affect for Power-gamers
2018-07-05 09:49:07 -04:00
c8f5791557
Converts antimagic from GetComponent to a signal
2018-07-05 03:26:34 -05:00
759dddb821
Fixes signals
2018-07-05 01:42:05 -04:00
816257ae7d
fuck
2018-07-05 01:38:46 -04:00
b2ec8f89e0
missed files
2018-07-05 01:27:07 -04:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
06d08c67c3
[MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated ( #7327 )
...
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852 )
* a commit message
* reviews addressed?
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
2018-07-04 18:38:53 -07:00
7673384890
[MIRROR] [s] Fixes announcement XSS ( #7324 )
...
* [s] Fixes announcement XSS
* Merge pull request #38892 from ThatLing/robots-are-very-delicate
[s] Fixes announcement XSS
2018-07-04 17:40:10 -07:00
cc628a905e
two major fixes - fixes flavortext and right click exploit
2018-07-04 16:41:55 -04:00
abc32ed0df
adds "cap's female formal outfit" ( #7307 )
...
* Update under.dm
* modifies cit_clothes.dmi
* Updates uniforms.dmi
* Update security.dm
* now wont remove other clothing stuff (TM)
* Add files via upload
* Update under.dm
2018-07-04 05:37:01 -07:00
22e56253d0
[MIRROR] Fixes gravity gun runtimes. ( #7310 )
...
* Merge pull request #38867 from AnturK/gravgun
Fixes gravity gun runtimes.
* Fixes gravity gun runtimes.
2018-07-03 09:14:26 -07:00
7f0c82b0ba
[MIRROR] SDQL where filter message is now correct ( #7309 )
...
* Merge pull request #38853 from optimumtact/seequeuedeeall
SDQL where filter message is now correct
* SDQL where filter message is now correct
2018-07-03 09:14:00 -07:00
f986f9c9f2
makes it compile. should work. hopefully
2018-07-02 15:35:11 -04:00
0500be9b35
[MIRROR] Fixes some shard harddel stuff. ( #7299 )
...
* Fixes some shard harddel stuff. (#38799 )
* Fixes some shard harddel stuff.
2018-07-02 06:44:50 -07:00
6b0e597553
[MIRROR] Fix circuit printer printing finished TEG machinery ( #7294 )
...
* Merge pull request #38844 from AutomaticFrenzy/patch/circuits
Fix circuit printer printing finished TEG machinery
* Fix circuit printer printing finished TEG machinery
2018-07-02 03:23:49 -07:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
63013f8964
everything to controllers
2018-07-02 00:10:31 -04:00
74f7e56f4e
Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797
...
[MIRROR] Fixes TGUI runtime
2018-07-01 09:41:03 -05:00
ee0bef443e
Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796
...
[MIRROR] Fixes emitter runtime
2018-07-01 09:39:43 -05:00
af5a250ce4
Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779
...
[MIRROR] Fixes arrivals shuttle damage message runtime
2018-07-01 09:39:28 -05:00
42c322ca2c
Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789
...
[MIRROR] Cleans up leftover telesci teleporter code
2018-07-01 09:39:08 -05:00
b5b8ce5337
Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751
...
[MIRROR] Updates plastic flaps icon and cleans up its code
2018-07-01 09:38:16 -05:00
2b9aca8143
Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795
...
[MIRROR] [s] Fixes PDA ID teleporting
2018-07-01 09:37:45 -05:00
2303e23f2c
Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776
...
[MIRROR] Potentially fixes monkey fever runtiming on infection
2018-07-01 09:37:24 -05:00
be23ad6a06
Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656
...
[MIRROR] Makes the deconstructable TEG working
2018-07-01 09:36:57 -05:00
c7b830d2c6
Merge pull request #7276 from Citadel-Station-13/upstream-merge-38834
...
[MIRROR] Add welded shut message to vent scrubber
2018-07-01 09:36:33 -05:00
e1d6ee593b
Merge pull request #7275 from Citadel-Station-13/upstream-merge-38800
...
[MIRROR] Adds missing armor to accessories
2018-07-01 09:36:13 -05:00
f7fef5f1ed
Merge pull request #7273 from Citadel-Station-13/upstream-merge-38804
...
[MIRROR] Adds a colour picker component for circuits
2018-07-01 09:35:51 -05:00
96fcd9275f
Merge pull request #7268 from Citadel-Station-13/kevinz000-patch-9
...
boh fix mirror broke
2018-07-01 09:33:53 -05:00
389faab2a5
Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728
...
[MIRROR] Gives honey antibiotic properties
2018-07-01 09:33:36 -05:00
727aa6b2a9
Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745
...
[MIRROR] Fixes not receiving AI destroy objective during IAA
2018-07-01 09:32:39 -05:00
16eefdd1e6
Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646
...
[MIRROR] [Ready]Expands the list of borg-wearable hats
2018-07-01 09:32:08 -05:00
18b8aad8cb
Merge pull request #7262 from Citadel-Station-13/upstream-merge-38690
...
[MIRROR] Destructive analyzers can now destroy anything again, even if it has no materials
2018-07-01 09:31:12 -05:00
7100ae3a7b
Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727
...
[MIRROR] Prevents reagents being transferred to a bucket while its worn on a head
2018-07-01 09:30:46 -05:00
74730261b0
Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689
...
[MIRROR] Move throwforce up to atom/movable
2018-07-01 09:30:09 -05:00
de6ae20f87
Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644
...
[MIRROR] Port AI static to vis_contents
2018-07-01 09:29:10 -05:00
fe0c43fea2
Merge pull request #7252 from Citadel-Station-13/upstream-merge-38708
...
[MIRROR] Fix runtimes when energy guns are deleted
2018-07-01 09:28:20 -05:00
35b2338181
Merge pull request #7251 from Citadel-Station-13/upstream-merge-38709
...
[MIRROR] Fix being unable to export mechs
2018-07-01 09:28:03 -05:00
cd842fc20f
Merge pull request #7250 from Citadel-Station-13/upstream-merge-38702
...
[MIRROR] Remove unused and probably misbehaving admin human manifest spawner
2018-07-01 09:27:45 -05:00
e54ed36415
Merge pull request #7249 from Citadel-Station-13/upstream-merge-38699
...
[MIRROR] Hardsuit helmets protect eyes from pepperspray
2018-07-01 09:27:07 -05:00
b2fb67c607
Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683
...
[MIRROR] Fixes anomaly area selection.
2018-07-01 09:26:38 -05:00
fb64d5ce71
Merge pull request #7247 from Citadel-Station-13/upstream-merge-38672
...
[MIRROR] Fix the MOTD having too many newlines
2018-07-01 09:26:04 -05:00
3dfeb02512
Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697
...
[MIRROR] Improves machine overload logging
2018-07-01 09:25:40 -05:00
8e21d77c4d
Merge pull request #7244 from Citadel-Station-13/upstream-merge-38696
...
[MIRROR] fixes a cult message.fixes a cult message.
2018-07-01 09:25:21 -05:00
deathride58