shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,110 Commits 5 Branches 0 Tags
b8b495ba42136bc162ced5167df7f038e51359e7
Commit Graph
6770 Commits
Author SHA1 Message Date
kevinz000andGitHub b8b495ba42 Update species.dm 2018-07-12 09:38:31 -07:00
deathride58andGitHub 914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550 
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
 2018-07-10 02:03:08 -04:00
deathride58andGitHub 0235f37fd0 Merge pull request #7339 from Trilbyspaceclone/patch-3 
Adds more to the Autodrobe coin slot!
 2018-07-10 02:00:06 -04:00
deathride58andGitHub 4f5eb02cca Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649 
[MIRROR] Converts antimagic from GetComponent to a signal
 2018-07-10 01:59:14 -04:00
deathride58andGitHub 21b6c7986b Merge pull request #7193 from Citadel-Station-13/kevinz000-patch-13 
Cyborgs now drop their encryption keys on detonation/deconstruction
 2018-07-10 01:58:59 -04:00
deathride58andGitHub 78241f4237 Merge pull request #7351 from Citadel-Station-13/upstream-merge-38930 
[MIRROR] Cleans up other components destroys
 2018-07-10 01:58:36 -04:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
TrilbySpaceClone ffc5c6935a Lets see If I did this correct this time! 2018-07-06 18:01:29 -04:00
TrilbySpaceClone 71c259b0c4 MoModularized, plz don't yell at me 2018-07-06 17:33:07 -04:00
TrilbySpaceClone 5698720335 Merge branch 'WT-550' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into WT-550 2018-07-06 15:50:45 -04:00
TrilbySpaceClone d764f5128a Adds in the ammo and the bullet! 2018-07-06 15:49:19 -04:00
TrilbyspacecloneandGitHub 64b1fca976 Update weapon_designs.dm 2018-07-06 14:59:26 -04:00
TrilbyspacecloneandGitHub b3ecedff4f Update weapon_designs.dm 2018-07-06 14:49:28 -04:00
TrilbySpaceClone 619a64173f Hopefully this will add in the missing WT-550 Toxin Ammo for sec to use! (Combat medics will use this to heal slime's more then likely as well) 2018-07-06 13:56:06 -04:00
MacHacandletterjay ea93edc21f Fixes #38878: Bedsheets once again influence dreams. (#38883) 2018-07-06 11:45:11 -05:00
vuonojenmustaturskaandletterjay 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
AnturKandletterjay cc1070c7db Cleans up other components destroys (#38930) 
* wearertargeting destroy

* Why did these variables even existed.

* ....
 2018-07-06 11:39:42 -05:00
AnturKandletterjay dd8461d0a0 Fixes animals trying to break map border (#38929) 2018-07-06 11:39:34 -05:00
81Dentonandletterjay 1336a555d4 Disables knockdown/throw on supply shuttle docking (#38932) 2018-07-06 11:37:18 -05:00
kevinz000andletterjay 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
81Dentonandletterjay 023f53a470 Improves cargo shuttle/firefighting foam descs (#38927) 
* Improves cargo shuttle/firefighting foam descs

* oof
 2018-07-06 09:42:33 -05:00
deathride58andGitHub 924fcc29fb Merge branch 'master' into kevinz000-patch-13 2018-07-06 01:39:25 -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 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
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 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 b3c28c36fa Merge branch 'master' into upstream-merge-38649 2018-07-06 01:34:12 -04: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
jegubandletterjay 0180039518 Adds a sprite for Glowcaps. (#38908) 2018-07-05 13:40:46 -05:00
TrilbyspacecloneandGitHub 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
Emmett Gainesandletterjay c8f5791557 Converts antimagic from GetComponent to a signal 2018-07-05 03:26:34 -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
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
deathride58 f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04: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
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJayandGitHub ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796 
[MIRROR] Fixes emitter runtime
 2018-07-01 09:39:43 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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