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

6788 Commits

Author SHA1 Message Date
deathride58
6b88d1843d Merge pull request #7385 from Citadel-Station-13/kevinz000-patch-1 
removes flightsuits until pixel movement is out and i can redesign them
 2018-07-28 09:18:06 -04:00
deathride58
f637425108 Merge pull request #7387 from Citadel-Station-13/wormhole_update 
wormhole guns now pass through mobs without doing anything but gain hitscan
 2018-07-28 09:17:00 -04:00
kevinz000
03843f1b20 Update asset_cache.dm 2018-07-26 00:43:52 -07:00
kevinz000
5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
kevinz000
e29016b257 Update wormhole.dm 2018-07-21 02:17:54 -07:00
kevinz000
6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
kevinz000
9547bed028 Update all_nodes.dm 2018-07-20 03:30:38 -07:00
deathride58
f9e7b491ae Merge pull request #7370 from Citadel-Station-13/kevinz000-patch-3 
gives AI smartfridge interaction why not we already caved and let them fuck wtih vending machines
 2018-07-18 18:07:10 -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
0e13b3b1c6 Update smartfridge.dm 2018-07-14 23:44:52 -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
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
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
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
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
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