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

11254 Commits

Author SHA1 Message Date
deathride58 d904b54e7c Merge pull request #7350 from Citadel-Station-13/upstream-merge-38929 
[MIRROR] Fixes animals trying to break map border
 2018-07-10 01:58:19 -04:00
deathride58 bf89d077ba Merge pull request #7349 from Citadel-Station-13/upstream-merge-38932 
[MIRROR] Disables knockdown/throw on supply shuttle docking
 2018-07-10 01:58:02 -04:00
deathride58 8025ba5a1f Merge pull request #7348 from Citadel-Station-13/upstream-merge-38935 
[MIRROR] minor turf reservation fix - no longer reserves 1 more height+width than necessary, checks against invalid sizes
 2018-07-10 01:57:46 -04:00
deathride58 03f3c6b993 Merge pull request #7346 from Citadel-Station-13/upstream-merge-38927 
[MIRROR] Improves cargo shuttle/firefighting foam descs
 2018-07-10 01:57:30 -04:00
deathride58 4cdd3bbaa1 Merge pull request #7352 from Citadel-Station-13/upstream-merge-38931 
[MIRROR] Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-10 01:57:08 -04:00
deathride58 55e5d803aa Merge pull request #7353 from Citadel-Station-13/upstream-merge-38883 
[MIRROR] Bedsheets once again influence dreams.
 2018-07-10 01:56:47 -04:00
deathride58 8b58db057e Merge pull request #7355 from Citadel-Station-13/upstream-merge-38934 
[MIRROR] Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects
 2018-07-10 01:56:32 -04:00
deathride58 6a5087877b Merge pull request #7129 from PolymorphBlue/vTecControl 
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
 2018-07-09 00:26:23 -04:00
vuonojenmustaturska 417496aa6e Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects (#38934) 
* Wrap setting anchored for structures, fix atmos bug

* forgot this

* Add a signal for setanchored

* move setanchored to obj

* machinery, also some structure stuff

* tabbing
 2018-07-06 13:28:01 -05:00
MacHac ea93edc21f Fixes #38878: Bedsheets once again influence dreams. (#38883) 2018-07-06 11:45:11 -05:00
vuonojenmustaturska f36ab6982b Fixes pulse rifles exploding structures in nullspace and that sort of thing (#38931) 
* memes

* i just woke up ok
 2018-07-06 11:40:54 -05:00
AnturK dd8461d0a0 Fixes animals trying to break map border (#38929) 2018-07-06 11:39:34 -05:00
81Denton 1336a555d4 Disables knockdown/throw on supply shuttle docking (#38932) 2018-07-06 11:37:18 -05:00
kevinz000 a53c7a71ea minor turf reservation fix (#38935) 
no longer reserves 1 more height+width than necessary, checks against invalid sizes
 2018-07-06 11:35:34 -05:00
kevinz000 04993d4dba Update dance_machine.dm 2018-07-06 08:16:41 -07:00
81Denton 023f53a470 Improves cargo shuttle/firefighting foam descs (#38927) 
* Improves cargo shuttle/firefighting foam descs

* oof
 2018-07-06 09:42:33 -05:00
deathride58 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
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 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
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
Jordan Brown 1a2f82bdb9 Adds comments to _globals.dm (#38893) 
"Help" "understanding"
 2018-07-05 18:21:59 -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 816257ae7d fuck 2018-07-05 01:38:46 -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 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
CitadelStationBot 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 N 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
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 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 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
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
deathride58 63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
LetterJay 74f7e56f4e Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797 
[MIRROR] Fixes TGUI runtime
 2018-07-01 09:41:03 -05: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 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
LetterJay 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
LetterJay 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
LetterJay 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
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