shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,450 Commits 5 Branches 0 Tags
d8ab924b72a246e297ade77d4cf35fc4193df490
Commit Graph

7450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robustin
d8ab924b72 Smoke Machine Fixes (#31806) 2017-10-17 12:34:28 -05:00
CitadelStationBot
9691c9130f Automatic changelog generation for PR #3447 [ci skip] 2017-10-17 09:18:57 -05:00
LetterJay
bdbf1f509a Merge pull request #3447 from Citadel-Station-13/upstream-merge-31775 
[MIRROR] lowers portable pump max pressure to 25 atm
 2017-10-17 10:18:55 -04:00
CitadelStationBot
1cc1a22ba6 Automatic changelog generation for PR #3457 [ci skip] 2017-10-17 09:00:14 -05:00
LetterJay
875d805403 Merge pull request #3457 from Citadel-Station-13/CWCIcons 
Fixes missing CWC icons
 2017-10-17 10:00:12 -04:00
LetterJay
9a90445554 Merge pull request #3455 from Citadel-Station-13/upstream-merge-31660 
[MIRROR] Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities
 2017-10-17 08:59:28 -04:00
CitadelStationBot
7ee30feb18 Automatic changelog generation for PR #3454 [ci skip] 2017-10-17 07:59:21 -05:00
LetterJay
d6daa8b3e9 Merge pull request #3454 from Citadel-Station-13/upstream-merge-31699 
[MIRROR] Increasew the size of the katana from normal to huge
 2017-10-17 08:59:20 -04:00
CitadelStationBot
f8abedde26 Automatic changelog generation for PR #3453 [ci skip] 2017-10-17 07:58:41 -05:00
LetterJay
dc17bfd316 Merge pull request #3453 from Citadel-Station-13/upstream-merge-31750 
[MIRROR] Prevent creampie overlays from stacking.
 2017-10-17 08:58:39 -04:00
LetterJay
e3922656fc Merge pull request #3452 from Citadel-Station-13/upstream-merge-31761 
[MIRROR] obj_break() will always be called before obj_destruction()
 2017-10-17 08:58:20 -04:00
CitadelStationBot
8cb9316afa Automatic changelog generation for PR #3451 [ci skip] 2017-10-17 07:58:12 -05:00
LetterJay
db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972 
[MIRROR] Atmospherics Multilayer Pipes
 2017-10-17 08:58:10 -04:00
LetterJay
21823820c4 Merge pull request #3450 from Citadel-Station-13/upstream-merge-31721 
[MIRROR] Fixed the shuttle navigation computer allowing you to move docking ports
 2017-10-17 08:57:11 -04:00
LetterJay
c493f75917 Merge pull request #3449 from Citadel-Station-13/upstream-merge-31783 
[MIRROR] Adds a duplicate stack_trace to /datum
 2017-10-17 08:56:52 -04:00
LetterJay
29ad231f6a Merge pull request #3448 from Citadel-Station-13/upstream-merge-31790 
[MIRROR] Fixes me forgetting a semicolon in sargeant araneus
 2017-10-17 08:56:42 -04:00
CitadelStationBot
a2fdf20d4a Automatic changelog generation for PR #3446 [ci skip] 2017-10-17 07:55:56 -05:00
LetterJay
ba3a8de585 Merge pull request #3446 from Citadel-Station-13/upstream-merge-31673 
[MIRROR] Fixes cogged APCs being permanently locked to non-servants
 2017-10-17 08:55:54 -04:00
CitadelStationBot
50506df9a0 Automatic changelog generation for PR #3445 [ci skip] 2017-10-17 07:55:44 -05:00
LetterJay
135b2a3b1d Merge pull request #3445 from Citadel-Station-13/upstream-merge-31741 
[MIRROR] Fixes some copypasted airlocks referring to nonexistent overlay sprites
 2017-10-17 08:55:42 -04:00
CitadelStationBot
e1bb8bdda9 Automatic changelog generation for PR #3444 [ci skip] 2017-10-17 07:55:35 -05:00
LetterJay
3f339a9908 Merge pull request #3444 from Citadel-Station-13/upstream-merge-31742 
[MIRROR] Removes a misleading message when handling full stacks of sheets.
 2017-10-17 08:55:33 -04:00
CitadelStationBot
caee1c7505 Automatic changelog generation for PR #3443 [ci skip] 2017-10-17 07:54:59 -05:00
LetterJay
1e67c696f2 Merge pull request #3443 from Citadel-Station-13/upstream-merge-31749 
[MIRROR] Decapitation creampie fix [Fix] (#19701)
 2017-10-17 08:54:58 -04:00
CitadelStationBot
bb028777cf Automatic changelog generation for PR #3442 [ci skip] 2017-10-17 07:54:43 -05:00
LetterJay
612f2eccc2 Merge pull request #3442 from Citadel-Station-13/upstream-merge-31757 
[MIRROR] Makes player-controlled minebots a target for ocular wardens
 2017-10-17 08:54:42 -04:00
LetterJay
af1f7ce8d0 Merge pull request #3441 from Citadel-Station-13/upstream-merge-31772 
[MIRROR] Add a safety check for usr in airlock shocking
 2017-10-17 08:54:33 -04:00
LetterJay
ad07c97ab5 Merge pull request #3440 from Citadel-Station-13/upstream-merge-31771 
[MIRROR] Fixes atmos machinery examine
 2017-10-17 08:54:24 -04:00
LetterJay
1c35ac46e6 Merge pull request #3439 from Citadel-Station-13/upstream-merge-31768 
[MIRROR] Trims ahelps
 2017-10-17 08:54:14 -04:00
LetterJay
2f76bcde80 Merge pull request #3438 from Citadel-Station-13/upstream-merge-31763 
[MIRROR] Raises starting GBP to 5
 2017-10-17 08:53:52 -04:00
LetterJay
52db4fc0df Merge pull request #3437 from Citadel-Station-13/upstream-merge-31744 
[MIRROR] Fixes godhand having no inhand sprite
 2017-10-17 08:53:37 -04:00
LetterJay
7cf4b3b26c Fixes missing CWC icons 2017-10-17 07:51:15 -05:00
LetterJay
a07871c9de Update pump.dm 2017-10-17 07:46:18 -05:00
LetterJay
7526b3cb94 Update human_defines.dm 2017-10-17 07:46:05 -05:00
CitadelStationBot
45ab43f23a Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities 2017-10-17 03:51:10 -05:00
kevinz000
87b84cedf0 Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities (#31660) 
* Update projectile.dm

* fixes projectiles
 2017-10-17 03:51:10 -05:00
CitadelStationBot
34141c7c7e Increasew the size of the katana from normal to huge 2017-10-17 03:49:58 -05:00
oranges
baae0dcd15 Merge pull request #31699 from jughu/Misc 
Increasew the size of the katana from normal to huge
 2017-10-17 03:49:58 -05:00
Mercenaryblue
06ea404a28 Prevent creampie overlays from stacking. 2017-10-17 03:48:45 -05:00
CitadelStationBot
d16a93813e obj_break() will always be called before obj_destruction() 2017-10-17 03:44:31 -05:00
oranges
8353428c43 Merge pull request #31761 from tgstation/Cyberboss-patch-3 
obj_break() will always be called before obj_destruction()
 2017-10-17 03:44:31 -05:00
CitadelStationBot
9fddf78876 Atmospherics Multilayer Pipes 2017-10-17 00:49:12 -05:00
kevinz000
a41725a955 Atmospherics Multilayer Pipes (#30972) 
* 1

* rpd

* 3

* 4

* 5

* 6

* 7

* 8

* wew

* src. and underlays

* update

* woops

* misspelled params

* reviews

* fixes

* fixes

* better checks and layer crap

* Update RPD.dm

* Update pipe_construction.dm

* 3 layers, fixes

* woops i didn't update defines correctly

* dunc

* Fixes

* Fixes

* fixes

* fixes some more bullshit

* fixes

* fixes

* not needed

* makes attachment sprites prettier or uglier i dunno

* Unary flag

* sprite fix??

* fixes...

* sprite fixes
 2017-10-17 00:49:12 -05:00
CitadelStationBot
d84c088e6d Fixed the shuttle navigation computer allowing you to move docking ports 2017-10-16 23:02:02 -05:00
Cruix
f2f2f349ca Fixed the shuttle navigation computer allowing you to move docking ports (#31721) 
* Fixed the shuttle navigation computer allowing you to move stationary docking ports

* Moved a var from stationary docking ports to mobile docking ports

* Removed a sanity check
 2017-10-16 23:02:02 -05:00
CitadelStationBot
694b6fce12 Adds a duplicate stack_trace to /datum 2017-10-16 22:56:44 -05:00
Jordan Brown
fafdf339ff Adds a duplicate stack_trace to /datum (#31783) 2017-10-16 22:56:44 -05:00
CitadelStationBot
0ff7f9ef45 Fixes me forgetting a semicolon in sargeant araneus 2017-10-16 22:55:31 -05:00
kevinz000
89fbf077d9 Fixes missing semicolon in sargeant araneus vars (#31790) 
* semicolon

* no define
 2017-10-16 22:55:31 -05:00
LetterJay
35c80edc7a Update pump.dm 2017-10-16 20:52:33 -05:00