shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,032 Commits 5 Branches 0 Tags
023f53a47090afe8519afd71ec155716cef3bcc1
Commit Graph
18032 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
81Dentonandletterjay 023f53a470 Improves cargo shuttle/firefighting foam descs (#38927) 
* Improves cargo shuttle/firefighting foam descs

* oof
 2018-07-06 09:42:33 -05:00
LetterJayandGitHub 981743a170 Update custom_items.dm 2018-07-06 00:54:21 -05:00
LetterJayandGitHub 5ad7fc35fd Update __donator.dm 2018-07-06 00:54:01 -05:00
LetterJay a64dba6270 Merge branch 'flagcape' 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:51:42 -05:00
LetterJay 3d7d862861 fuckoff 2018-07-06 00:50:13 -05:00
LetterJayandGitHub b245b940a4 Update custom_items.dm 2018-07-06 00:46:48 -05:00
LetterJay 5cacbfbe2e Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape 
# Conflicts:
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:45:52 -05:00
deathride58andGitHub 65e2d7695b Merge pull request #7152 from LetterN/patch-3 
removes extra circuit config
 2018-07-06 01:42:38 -04:00
LetterJay 637c64f55b fuk 2018-07-06 00:42:25 -05:00
deathride58andGitHub 5f4e19000d Merge pull request #7308 from Citadel-Station-13/kevinz000-patch-9 
protects load_mentors from accidental wipe due to advproccall interrupting sql operations
 2018-07-06 01:40:20 -04:00
LetterJayandGitHub 034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings 
Adds devilwings donor item for kitsun
 2018-07-06 00:40:00 -05:00
deathride58andGitHub 891bdd718d Merge pull request #7083 from Citadel-Station-13/kevinz000-patch-8 
nerfs techwebs passive generation, pushes back full max time by 15 minutes
 2018-07-06 01:38:42 -04:00
deathride58andGitHub cee8da4fdb Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11 
readds tesla coil deathtraps
 2018-07-06 01:37:42 -04:00
deathride58andGitHub cec2871db2 Merge pull request #7293 from LetterN/patch-4 
fixes kinkmate
 2018-07-06 01:36:15 -04:00
deathride58andGitHub 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
CitadelStationBot 3ed9e8b784 Automatic changelog generation for PR #7342 [ci skip] 2018-07-06 00:35:33 -05:00
deathride58andGitHub 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
deathride58andGitHub f7b2534292 Merge pull request #7341 from Citadel-Station-13/upstream-merge-38893 
[MIRROR] Adds comments to _globals.dm
 2018-07-06 01:35:08 -04:00
CitadelStationBot 3773aa5498 Automatic changelog generation for PR #7340 [ci skip] 2018-07-06 00:34:52 -05:00
deathride58andGitHub 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
deathride58andGitHub 5924595c8d adds icon_override 2018-07-06 00:48:21 -04:00
LetterJayandGitHub 8e0a1a64af oops 2018-07-05 23:44:44 -05:00
LetterJay f8828db041 donator cape 2018-07-05 23:43:47 -05:00
LetterJayandGitHub d75a9cf368 Merge pull request #7292 from deathride58/hopefullythefinalhardsync 
[READY FOR MERGE] Hopefully the final hard sync
 2018-07-05 21:10:08 -05:00
letterjay bdc787c302 Add medical HUD icon if the body has died recently enough to be defibbed 2018-07-05 18:55:54 -05:00
Jared-Fogleandletterjay 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
letterjay 69ca7391ff Adds comments to _globals.dm 2018-07-05 18:21:59 -05:00
Jordan Brownandletterjay 1a2f82bdb9 Adds comments to _globals.dm (#38893) 
"Help" "understanding"
 2018-07-05 18:21:59 -05:00
letterjay eaa249d624 Adds a sprite for Glowcaps. 2018-07-05 13:40:46 -05:00
jegubandletterjay 0180039518 Adds a sprite for Glowcaps. (#38908) 2018-07-05 13:40:46 -05:00
deathride58 8d8035950e Fixes centcom titlescreen resolution, finally 2018-07-05 04:23:12 -04:00
deathride58 759dddb821 Fixes signals 2018-07-05 01:42:05 -04:00
deathride58 816257ae7d fuck 2018-07-05 01:38:46 -04:00
deathride58 ff8a90b880 DME 2018-07-05 01:37:57 -04:00
deathride58 b2ec8f89e0 missed files 2018-07-05 01:27:07 -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
CitadelStationBot e92379e360 Automatic changelog generation for PR #7327 [ci skip] 2018-07-04 20:38:56 -05:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
deathride58 cc628a905e two major fixes - fixes flavortext and right click exploit 2018-07-04 16:41:55 -04:00
Letter Nandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
kevinz000andGitHub 80f8f7e1b1 Update mentor.dm 2018-07-03 06:33:33 -07:00
deathride58 f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58 6873a7c065 DME and dockerfile 2018-07-02 13:04:33 -04:00
CitadelStationBotandkevinz000 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
CitadelStationBot 028c3105b9 Automatic changelog generation for PR #7294 [ci skip] 2018-07-02 05:23:54 -05:00
CitadelStationBotandkevinz000 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