shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,009 Commits 5 Branches 0 Tags
cee8da4fdb32ea9deefc118f0492235b6bce9ff8
Commit Graph

6739 Commits

Author SHA1 Message Date
deathride58
cee8da4fdb Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11 
readds tesla coil deathtraps
 2018-07-06 01:37:42 -04:00
deathride58
4ae3bff79a Merge pull request #7266 from Citadel-Station-13/kevinz000-patch-7 
stops admins from "accidentally" ending the round by elder god
 2018-07-06 01:35:51 -04:00
deathride58
8173e11740 Merge pull request #7342 from Citadel-Station-13/upstream-merge-38909 
[MIRROR] Add medical HUD icon if the body has died recently enough to be defibbed
 2018-07-06 01:35:29 -04:00
deathride58
b97ed1d248 Merge pull request #7340 from Citadel-Station-13/upstream-merge-38908 
[MIRROR] Adds a sprite for Glowcaps.
 2018-07-06 01:34:50 -04:00
Jared-Fogle
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
jegub
0180039518 Adds a sprite for Glowcaps. (#38908) 2018-07-05 13:40:46 -05:00
deathride58
759dddb821 Fixes signals 2018-07-05 01:42:05 -04:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
deathride58
cc628a905e two major fixes - fixes flavortext and right click exploit 2018-07-04 16:41:55 -04:00
CitadelStationBot
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
CitadelStationBot
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
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
CitadelStationBot
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
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796 
[MIRROR] Fixes emitter runtime
 2018-07-01 09:39:43 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675 
[MIRROR] Fixed cyborgs not getting their names at round start
 2018-07-01 09:24:46 -05:00
ShizCalev
6c89362f60 Fixes emitter runtime (#38796) 
fire() was already handled at 199-204
 2018-07-01 05:44:10 -05:00
ShizCalev
6814022a1b Fixes arrivals shuttle damage message runtime (#38779) 2018-07-01 05:43:51 -05:00
Dennok
58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -05:00
Matt Smith
17d59060ad Add welded shut message to vent scrubber (#38834) 2018-07-01 05:41:43 -05:00
AnturK
18dd26ee3a Adds missing armor to accessories (#38800) 2018-07-01 05:41:32 -05:00
Thunder12345
8c58a28a60 Adds a colour picker component for circuits (#38804) 
* added color picker IC component

* added sprite for color picker
 2018-07-01 05:40:43 -05:00
81Denton
f244ec31a0 Gives honey antibiotic properties (#38728) 
* Gives honey antibiotic properties
henk

* 0.6
 2018-06-26 20:30:41 -05:00
kevinz000
8c71bbe36b Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:44:11 -07:00
kevinz000
4bddef70e2 Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:43:52 -07:00
kevinz000
8975695b54 Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:43:19 -07:00
kevinz000
df68eb864a Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:39:59 -07:00
Nich
4bbb592e12 Fixes IAA AI destroy objectives (#38745) 2018-06-26 17:02:24 -05:00
zxaber
673ad79a32 [Ready]Expands the list of borg-wearable hats (#38646) 
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Update robot.dm

* Update robot.dm

* Update robot.dm

* Update robot_defense.dm

* Update _masks.dm

* Update robot_parts.dm

* Update robot_defense.dm

* replaced type with istype

* Reverting masks.dm

* Removing special snowflake bandana check.

* Update robot_defense.dm

* Added Captain's Crown

By player request.
 2018-06-26 15:54:54 -05:00
kevinz000
ef851d5744 Destructive analyzers can now destroy anything again, even if it has no materials (#38690) 
* Update rdconsole.dm

* Update destructive_analyzer.dm
 2018-06-26 15:42:16 -05:00