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

11284 Commits

Author SHA1 Message Date
deathride58
d2e76ac67e Merge pull request #7369 from Citadel-Station-13/kevinz000-patch-2 
Fixes doppler arrays detecting explosions it shouldn't detect
 2018-07-17 11:19:53 -04:00
deathride58
a18525ad06 Merge pull request #7366 from Citadel-Station-13/mirror-38933 
[requires testmerge]upstream mirror - projectile pathing/hitscan lighting refactor
 2018-07-17 11:19:07 -04:00
kevinz000
6b1dbf8561 Update flash.dm 2018-07-16 15:33:53 -07:00
deathride58
0fb43d5c4b Merge pull request #7364 from Citadel-Station-13/kevinz000-patch-1 
flightsuit speed rebalancing
 2018-07-15 17:52:26 -04:00
kevinz000
abd38ba0f2 Update doppler_array.dm 2018-07-14 23:34:42 -07:00
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
kevinz000
b8b495ba42 Update species.dm 2018-07-12 09:38:31 -07:00
Bear
88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00
Bear
4f48bc2dd5 pAI screen displays 2018-07-10 07:37:16 -04:00
Bear
82f513d204 holochassis options 2018-07-10 07:10:15 -04:00
deathride58
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
deathride58
0235f37fd0 Merge pull request #7339 from Trilbyspaceclone/patch-3 
Adds more to the Autodrobe coin slot!
 2018-07-10 02:00:06 -04:00
deathride58
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
deathride58
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
deathride58
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
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
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
Trilbyspaceclone
64b1fca976 Update weapon_designs.dm 2018-07-06 14:59:26 -04:00
Trilbyspaceclone
b3ecedff4f Update weapon_designs.dm 2018-07-06 14:49:28 -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
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
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
cc1070c7db Cleans up other components destroys (#38930) 
* wearertargeting destroy

* Why did these variables even existed.

* ....
 2018-07-06 11:39:42 -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
924fcc29fb Merge branch 'master' into kevinz000-patch-13 2018-07-06 01:39:25 -04: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
deathride58
b3c28c36fa Merge branch 'master' into upstream-merge-38649 2018-07-06 01:34:12 -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