shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,597 Commits 5 Branches 0 Tags
055eacca74873e5b3caefb1f5704ab33da9581e4
Commit Graph

9862 Commits

Author SHA1 Message Date
deathride58 055eacca74 Merge pull request #6358 from Citadel-Station-13/upstream-merge-37073 
[MIRROR] Integrated Circuits Parameter Fixes
 2018-04-11 21:31:17 +00:00
deathride58 dd7cf18694 Merge pull request #6359 from Citadel-Station-13/upstream-merge-37077 
[MIRROR] Fixes warp whistle invis bug
 2018-04-11 21:30:16 +00:00
deathride58 43eee9851c Merge pull request #6360 from Citadel-Station-13/upstream-merge-37094 
[MIRROR] Fixes overlay update for washing bloody hands
 2018-04-11 21:29:52 +00:00
deathride58 6c107f538a Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107 
[MIRROR] Fixes jukebox ghost message spam
 2018-04-11 21:29:28 +00:00
deathride58 1f44356e49 Merge pull request #6364 from Citadel-Station-13/upstream-merge-37120 
[MIRROR] [s] Adds a centcom level check to launchpad.
 2018-04-11 21:28:50 +00:00
deathride58 72dfdb0a63 Merge pull request #6365 from Citadel-Station-13/upstream-merge-37032 
[MIRROR] Forcing the human liver to actually do its job v2
 2018-04-11 21:28:25 +00:00
deathride58 eebe38dc39 Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136 
[MIRROR] Removes some unused math defines/procs
 2018-04-11 21:27:58 +00:00
deathride58 1bec758c65 Merge pull request #6369 from Citadel-Station-13/upstream-merge-37130 
[MIRROR] Adds tesla coil cargo pack
 2018-04-11 21:27:26 +00:00
deathride58 84a94e1894 Merge pull request #6371 from Citadel-Station-13/upstream-merge-37123 
[MIRROR] Keeps SM shuttle shards from being unwrenched
 2018-04-11 21:27:05 +00:00
deathride58 ba276cf374 Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116 
[MIRROR] Fixes order of operations math errors with gas defines.
 2018-04-11 21:26:47 +00:00
deathride58 85cc5c177e Merge pull request #6374 from Citadel-Station-13/upstream-merge-37126 
[MIRROR] Fixes signals being raised too soon
 2018-04-11 21:26:22 +00:00
Jordan Brown 704b42411a Merge pull request #37000 from tgstation/KorPhaeron-patch-2 
Update compile options to make 512 support official
 2018-04-11 15:12:55 -05:00
Jordan Brown 68e0b31cf6 Fixes signals being raised too soon 2018-04-11 15:02:30 -05:00
The_Dreamweaver adac58f0c2 Fixes order of operations math errors with gas defines. 2018-04-11 15:02:22 -05:00
Denton 0ada58dd4f oof 2018-04-11 14:59:54 -05:00
Denton 04f7fc5788 adds tesla coil crate 2018-04-11 14:57:30 -05:00
ShizCalev e63553e278 Removes some unused math defines/procs 2018-04-11 14:15:14 -05:00
Winterous 065522800a Forcing the human liver to actually do its job v2 (#37032) 
* Update liver.dm

* Update liver.dm

* Update liver.dm
 2018-04-11 09:33:49 -05:00
Dax Dupont b6396256db [s] Adds a centcom level check to launchpad. (#37120) 
* Adds a centcom level check to launchpad

* Account for space americans
 2018-04-11 08:58:50 -05:00
ShizCalev f344bc76fe Fixes jukebox ghost message spam (#37107) 2018-04-11 07:31:57 -05:00
pigeons d14df868cd Fixes overlay update for washing bloody hands (#37094) 2018-04-11 07:30:45 -05:00
vuonojenmustaturska e9d2097610 Fixes warp whistle invis bug (#37077) 
* Update artefact.dm

* review
 2018-04-11 07:28:30 -05:00
Trevor Serpas 00f5570ccf Integrated Circuits Parameter Fixes 2018-04-11 07:22:11 -05:00
deathride58 4063781baf Merge pull request #6332 from Citadel-Station-13/upstream-merge-37040 
[MIRROR] Fixes Acute Respiratory Distress Syndrome not having a treshhold description
 2018-04-11 01:04:16 +00:00
deathride58 d6c2e4dd56 Merge pull request #6336 from Citadel-Station-13/upstream-merge-37050 
[MIRROR] Fix fullscreens added to clientless mobs not stretching properly
 2018-04-11 01:03:23 +00:00
deathride58 4b87170139 Adds "Man up" verb for admins. (#6296) 
* adds man up verb

* Update admin_verbs.dm

* adds man up global

* blech
 2018-04-10 17:34:45 -07:00
Jordan Brown 0a9ca8b073 Merge pull request #37050 from AutomaticFrenzy/patch/fullscreen-cloning 
Fix fullscreens added to clientless mobs not stretching properly
 2018-04-10 19:23:28 -05:00
oranges 4b34949340 Merge pull request #37071 from kevinz000/patch-480 
Fixes constants chips getting scrambled by EMPs
 2018-04-10 16:22:49 -07:00
Alomga 042fa8c5ff Update choking.dm (#37040) 2018-04-10 16:03:22 -05:00
deathride58 f33d77a073 Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065 
[MIRROR] Fixes escape pods not getting to their default destination
 2018-04-10 07:47:00 +00:00
deathride58 9647de2806 Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788 
[MIRROR] Fixed paperbin dropping and fingerprints
 2018-04-10 07:20:33 +00:00
deathride58 96191b8b6a Update emergency.dm 2018-04-10 03:15:27 -04:00
deathride58 e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
LetterJay dab96582bd Merge pull request #6306 from Citadel-Station-13/upstream-merge-37002 
[MIRROR] Fixes slime latching
 2018-04-09 16:40:14 -05:00
LetterJay d1067b4271 Merge pull request #6329 from Citadel-Station-13/upstream-merge-36571 
[MIRROR] Mark appearance_flags and sight as bitflags for VV
 2018-04-09 16:39:59 -05:00
LetterJay 7d93dec924 Merge pull request #6327 from Citadel-Station-13/upstream-merge-36915 
[MIRROR] Detective Scanner Fixes
 2018-04-09 16:39:46 -05:00
LetterJay 80e0be6d1e Merge pull request #6326 from Citadel-Station-13/upstream-merge-37072 
[MIRROR] Fix an error message grammer
 2018-04-09 16:39:28 -05:00
LetterJay c2ff35d28f Merge pull request #6325 from Citadel-Station-13/upstream-merge-37063 
[MIRROR] Fixes swarming runtime
 2018-04-09 16:39:10 -05:00
LetterJay 859cf53869 Merge pull request #6324 from Citadel-Station-13/upstream-merge-37059 
[MIRROR] Makes spacemove check location.
 2018-04-09 16:38:57 -05:00
LetterJay 8433e7b154 Merge pull request #6322 from Citadel-Station-13/upstream-merge-37042 
[MIRROR] Fixes underlying area grabbing subtypes
 2018-04-09 16:38:32 -05:00
LetterJay ba03df8c86 Merge pull request #6321 from Citadel-Station-13/upstream-merge-37053 
[MIRROR] Fixes overflow role latejoin
 2018-04-09 16:38:14 -05:00
LetterJay 60a72311a7 Merge pull request #6320 from Citadel-Station-13/upstream-merge-37036 
[MIRROR] Fixes an heirloom trait-related runtime that gets spammed in the logs
 2018-04-09 16:37:54 -05:00
LetterJay 6e89bdb737 Merge pull request #6316 from Citadel-Station-13/upstream-merge-37017 
[MIRROR] Adds an are you sure dialog when pressing delete note.
 2018-04-09 16:36:53 -05:00
LetterJay 954f1b0655 Merge pull request #6315 from Citadel-Station-13/kevinz000-patch-3 
>wiped my flavortext accidently
 2018-04-09 16:36:27 -05:00
LetterJay 294f1fdf45 Merge pull request #6314 from Citadel-Station-13/upstream-merge-37004 
[MIRROR] Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan
 2018-04-09 16:35:58 -05:00
LetterJay a1f70e87d5 Merge pull request #6313 from Citadel-Station-13/upstream-merge-37033 
[MIRROR] Makes revheads always show on top of the check antags listing.
 2018-04-09 16:35:43 -05:00
LetterJay 674ab59397 Merge pull request #6312 from Citadel-Station-13/upstream-merge-37038 
[MIRROR] Fixes a very common runtime involving incorrect proc signature on MakeSlippery overrides
 2018-04-09 16:35:28 -05:00
LetterJay 944b74b95c Merge pull request #6311 from Citadel-Station-13/upstream-merge-36991 
[MIRROR] Wrench Supermatter Shard to the ground
 2018-04-09 16:35:10 -05:00
Tad Hardesty 126c610ccd Mark appearance_flags and sight as bitflags for VV 2018-04-09 14:15:24 -05:00
Davidj361 075a879343 Fixed paperbin dropping and fingerprints (#36788) 
* Removed parent call to stop the paperbin from dropping from being carried when getting a pen or paper.

* Found a better fix

* Better operator

* Fixed fingerprints not being created upon paper bin interaction

* Review change
 2018-04-09 14:14:13 -05:00