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

5180 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
7526b3cb94 Update human_defines.dm 2017-10-17 07:46:05 -05:00
Mercenaryblue
06ea404a28 Prevent creampie overlays from stacking. 2017-10-17 03:48:45 -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
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
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
Jordan Brown
fafdf339ff Adds a duplicate stack_trace to /datum (#31783) 2017-10-16 22:56:44 -05:00
LetterJay
5ae1b16d6c Update airlock.dm 2017-10-16 20:52:19 -05:00
Ashe Higgs
4fd360c694 Fixes cogged APCs being permanently locked to non-servants (#31673) 
* Fixes cogged APCs being inaccessible

* Doop ba doop
 2017-10-16 16:49:01 -05:00
vuonojenmustaturska
af81a902fd Fixes some copypasted airlocks referring to nonexistent overlay sprites (#31741) 2017-10-16 16:48:52 -05:00
vuonojenmustaturska
6e1ef37f10 stops message spam (#31742) 2017-10-16 16:48:45 -05:00
Mercenaryblue
a83dbc4455 Decapitation creampie fix [Fix] (#19701) (#31749) 
* creampie fixes

prevent stacking creampie overlays.
makes cleaning it easier.
also fixing the creamy decapitation bug. ( #19701)

* optimize

* Revert "creampie fixes"

This reverts commit cb1d5bf254339442c977c0400317b20d3d130970.

* Split Issues

making sure we have one PR per issue.

* head removal fix
 2017-10-16 16:48:36 -05:00
vuonojenmustaturska
4ef21cc841 Makes player-controlled minebots a target for ocular wardens (#31757) 
* Makes player-controlled minebots a target for ocular wardens

* popularity reorder
 2017-10-16 16:48:29 -05:00
Leo
416816cd5f Add a safety check for usr in airlock shocking 2017-10-16 16:48:21 -05:00
Leo
201cf2c66b Merge pull request #31771 from tgstation/Cyberboss-patch-5 
Fixes atmos machinery examine
 2017-10-16 16:48:13 -05:00
Leo
3857bfb2fc Merge pull request #31768 from AnturK/ahelptrim 
Trims ahelps
 2017-10-16 16:48:04 -05:00
LetterJay
cc96777b6b wrong filepath 2017-10-16 16:46:02 -05:00
LetterJay
1c807d8bb8 donation item 2017-10-16 16:45:33 -05:00
KorPhaeron
74c6e7e23f Fixes godhand having no inhand sprite (#31744) 
* Fixes godhand having no inhand

* Correct file paths
 2017-10-16 14:34:11 -05:00
LetterJay
f0bc5936b6 Merge pull request #3434 from Citadel-Station-13/upstream-merge-31759 
[MIRROR] Fixes apprentices in check antags/roundend list
 2017-10-16 14:12:49 -04:00
LetterJay
24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707 
[MIRROR] Restores security bombsuit & white bombsuit
 2017-10-16 14:12:28 -04:00
AnturK
c85e760eac Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
LetterJay
638290e121 Merge pull request #3433 from Citadel-Station-13/upstream-merge-31765 
[MIRROR] Fixed fancy boxes not showing proper content amount.
 2017-10-16 10:40:06 -04:00
LetterJay
a3396b8fd0 Merge pull request #3431 from Citadel-Station-13/upstream-merge-31747 
[MIRROR] Removes hardcoded "full bottle" icons from several pre-filled reagent bottles
 2017-10-16 10:39:59 -04:00
LetterJay
7feae419a1 Merge pull request #3421 from deathride58/consensualaphro 
Make Crocin and Hexacrocin require arousal to be on to have lewd effects
 2017-10-16 10:39:50 -04:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
LetterJay
0f5fcfb44e Merge pull request #3417 from Citadel-Station-13/upstream-merge-31642 
[MIRROR]  Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons
 2017-10-16 10:39:30 -04:00
LetterJay
8ae369bf77 Update bottle.dm 2017-10-16 07:54:02 -05:00
LetterJay
75a4f22143 Update update_icons.dm 2017-10-16 07:53:19 -05:00
LetterJay
6f35f66dca Update update_icons.dm 2017-10-16 07:24:08 -05:00
Jordan Brown
98fb887ccc Merge pull request #31765 from DaxDupont/fancythis 
Fixed fancy boxes not showing proper content amount.
 2017-10-16 07:15:04 -05:00
LetterJay
1a3745b1f5 Merge pull request #3429 from Citadel-Station-13/upstream-merge-31691 
[MIRROR] EI NATH! now causes a flash of light
 2017-10-16 07:29:31 -04:00
LetterJay
4b6ebe3fa3 Merge pull request #3428 from Citadel-Station-13/upstream-merge-31710 
[MIRROR] Removes mapping error bandaid
 2017-10-16 07:29:20 -04:00
LetterJay
3160051499 Merge pull request #3425 from Citadel-Station-13/upstream-merge-31735 
[MIRROR] Fixes emotes not checking the right turf (or any turf for that matter)
 2017-10-16 07:28:13 -04:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665 
[MIRROR] Adds logging crew manifest to seperate file
 2017-10-16 07:28:03 -04:00
LetterJay
7824c58539 Merge pull request #3418 from Citadel-Station-13/upstream-merge-31728 
[MIRROR] Sunflower makeover, adds missing inhands sprites.
 2017-10-16 07:27:31 -04:00
LetterJay
399d84500c Merge pull request #3419 from Citadel-Station-13/upstream-merge-31139 
[MIRROR] Honkbots: The Clown's lil helpers.
 2017-10-16 07:27:15 -04:00