shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

9021 Commits

Author SHA1 Message Date
LetterJay 1e2fd6c235 Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293 
[MIRROR] Made cell / holding cell windoors their own subtype
 2017-07-19 13:41:37 -05:00
LetterJay 7b15a20022 Merge pull request #2038 from Citadel-Station-13/upstream-merge-29178 
[MIRROR] Ports /vg/'s datum component system
 2017-07-19 13:41:00 -05:00
LetterJay b2032ed7f5 Update turf.dm 2017-07-19 13:40:24 -05:00
LetterJay 0b27e4c11b Update _lists.dm 2017-07-19 13:39:49 -05:00
LetterJay cff128c5d5 Merge pull request #2073 from Citadel-Station-13/upstream-merge-29180 
[MIRROR] Small belt overlay rewrite, and tool overlays for toolbelts
 2017-07-19 13:37:25 -05:00
LetterJay c38fe60fc4 Update damage_procs.dm 2017-07-19 13:36:43 -05:00
LetterJay cd0845bcd8 Update damage_procs.dm 2017-07-19 13:34:20 -05:00
LetterJay 96179eded8 Update combat.dm 2017-07-19 13:32:38 -05:00
LetterJay dda03c03b0 Merge pull request #2074 from Citadel-Station-13/upstream-merge-29336 
[MIRROR] fixes goonchat css for some fonts not having proper sizes
 2017-07-19 13:31:20 -05:00
LetterJay 44ce24476a Merge pull request #2079 from Citadel-Station-13/upstream-merge-29344 
[MIRROR] Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha
 2017-07-19 13:30:44 -05:00
LetterJay 22ed4d63b9 Rename code/datums/component/components.dm to code/datums/components/component.dm 2017-07-19 13:22:20 -05:00
LetterJay 6050c5a881 Rename code/datums/components.dm to code/datums/component/components.dm 2017-07-19 13:21:11 -05:00
LetterJay 27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
LetterJay 25a098b965 Merge pull request #2069 from Citadel-Station-13/upstream-merge-29323 
[MIRROR] Picking up ores by crossing them no longer spams your chat box
 2017-07-19 13:18:17 -05:00
CitadelStationBot 62f633a1ad Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha 2017-07-19 11:19:35 -05:00
CitadelStationBot 79fcbfece6 Charging the clockwork slab now uses overlays 2017-07-19 10:57:09 -05:00
CitadelStationBot 88df8a412d Fixes Hijack Objective 2017-07-19 10:24:22 -05:00
CitadelStationBot b36b8475ff fixes goonchat css for some fonts not having proper sizes 2017-07-19 10:24:18 -05:00
CitadelStationBot e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
LetterJay 6fe243b647 Merge pull request #2067 from Citadel-Station-13/upstream-merge-29320 
[MIRROR] Electric guitars now properly use .ogg sound files
 2017-07-19 09:21:22 -05:00
LetterJay 85f1b25bcd Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556 
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
 2017-07-19 06:29:06 -05:00
LetterJay 95d2969339 Merge pull request #2068 from Citadel-Station-13/upstream-merge-29283 
[MIRROR] Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
 2017-07-19 05:34:56 -05:00
LetterJay 7cbdc0e2ae Merge pull request #2070 from Citadel-Station-13/upstream-merge-29356 
[MIRROR] Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
 2017-07-19 05:34:24 -05:00
LetterJay 92e967d904 Update vomit.dm 2017-07-19 05:15:51 -05:00
LetterJay a11a7f770d Update vision.dm 2017-07-19 05:15:34 -05:00
LetterJay ad2efb18be Update sensory.dm 2017-07-19 05:14:41 -05:00
CitadelStationBot f61e22958f split typecache filters into two procs 2017-07-19 05:12:17 -05:00
LetterJay a7b3516491 Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228 
[MIRROR] Fixes IV Drips
 2017-07-19 05:02:19 -05:00
LetterJay 5e8bee0d9b Merge pull request #2062 from Citadel-Station-13/upstream-merge-29313 
[MIRROR] Adds a move delay when resisting out of cryo
 2017-07-19 05:00:03 -05:00
LetterJay 14461521f8 Merge pull request #2058 from Citadel-Station-13/upstream-merge-29305 
[MIRROR] Fixes carbons not handling the Blood-Drunk status effect properly
 2017-07-19 04:59:30 -05:00
LetterJay 11772ffa74 Merge pull request #2057 from Citadel-Station-13/upstream-merge-29299 
[MIRROR] Prevents the anomalous crystal from making fantasy into reality
 2017-07-19 04:59:02 -05:00
LetterJay 91a2d1ca0b Update security.dm 2017-07-19 04:57:45 -05:00
LetterJay b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -05:00
LetterJay 98c2128386 Merge pull request #2052 from Citadel-Station-13/remove 
removes the 'yiff in hell' graffiti artwork
 2017-07-19 04:46:09 -05:00
LetterJay 0eacb2c7a8 Merge pull request #2051 from ktccd/Borer-lewds 
Borer lewds
 2017-07-19 04:45:53 -05:00
CitadelStationBot 4d79c387a8 Fix missing keyword argument syntax in typecache_filter_list 2017-07-19 04:09:00 -05:00
CitadelStationBot 0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot bf98e0d417 Picking up ores by crossing them no longer spams your chat box 2017-07-18 19:25:10 -05:00
CitadelStationBot 5801f6211f Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils 2017-07-18 18:45:30 -05:00
CitadelStationBot 5bb567ecb0 Electric guitars now properly use .ogg sound files 2017-07-18 13:51:25 -05:00
CitadelStationBot 1ebdf19cdb Refactor Lung Handling 2017-07-18 09:59:09 -05:00
CitadelStationBot 88bef4f0c0 Unwrenching clockwork structures no longer damages them 2017-07-18 09:47:52 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot 20070c370c Adds a move delay when resisting out of cryo 2017-07-18 09:43:34 -05:00
CitadelStationBot c294d781b6 Fixes flashbang stun times (#2056) 2017-07-18 06:14:29 -07:00
CitadelStationBot 665e1f2e8e Unprotects the deadmin list (#2059) 2017-07-18 06:14:19 -07:00
CitadelStationBot 8d9dc6dd13 [MIRROR] Fixes a ... likely important bug with shuttle code.... (#2061) 
* Fixes a ... likely important bug with shuttle code....

* Delete turf.dm.rej

* Update turf.dm
 2017-07-18 06:01:02 -07:00
CitadelStationBot 556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
ktccd 6aeb096054 Updates epinephrine flufftext 
Updating with less specific epinephrine flufftext.
 2017-07-18 14:43:39 +02:00
CitadelStationBot d99d886aa4 Fixes carbons not handling the Blood-Drunk status effect properly 2017-07-18 06:46:06 -05:00