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

3005 Commits

Author SHA1 Message Date
LetterJay
5bfabefc84 Merge pull request #3466 from Citadel-Station-13/upstream-merge-31806 
[MIRROR] Fixes for Smoke Machine Fixes
 2017-10-18 07:35:46 -04:00
LetterJay
93e6e4a798 Merge pull request #3463 from Citadel-Station-13/upstream-merge-31784 
[MIRROR] Next round of shuttle fixes at the cost of a small piece of my sanity
 2017-10-18 07:35:34 -04:00
LetterJay
271a287b52 Merge pull request #3461 from Citadel-Station-13/upstream-merge-31795 
[MIRROR] Random runtime fixes.
 2017-10-18 07:35:03 -04:00
LetterJay
47fa7b353c Merge pull request #3460 from Citadel-Station-13/upstream-merge-31800 
[MIRROR] Fixes automatic fire on guns
 2017-10-18 07:34:53 -04:00
LetterJay
bab51df97e Merge pull request #3459 from Citadel-Station-13/upstream-merge-31782 
[MIRROR] Corrects soil description
 2017-10-18 07:34:37 -04:00
LetterJay
ad35b9f65c Merge pull request #3458 from Citadel-Station-13/upstream-merge-31792 
[MIRROR] Corrects caravan ambush tool speed
 2017-10-18 07:34:27 -04:00
Robustin
d8ab924b72 Smoke Machine Fixes (#31806) 2017-10-17 12:34:28 -05:00
Emmett Gaines
8a336215f1 Next round of shuttle fixes at the cost of a small piece of my sanity (#31784) 
* shuttle bugs begone

* cleanup
 2017-10-17 12:00:46 -05:00
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes 
Random runtime fixes.
 2017-10-17 09:20:55 -05:00
Leo
a9389f4099 Merge pull request #31800 from DaxDupont/500hours 
Fixes automatic fire on guns
 2017-10-17 09:19:42 -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
ShizCalev
77ae7b7724 Corrects soil description 2017-10-17 08:23:21 -05:00
ShizCalev
d43de80540 Corrects caravan ambush tool speed (#31792) 
* Corrects caravan ambush tool speed

* subtype
 2017-10-17 08:22:07 -05: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
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
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
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
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
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
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
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
Mercenaryblue
06ea404a28 Prevent creampie overlays from stacking. 2017-10-17 03:48:45 -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
LetterJay
35c80edc7a Update pump.dm 2017-10-16 20:52:33 -05:00
Leo
2987fadd2e lowers portable pump max pressure to 25 atm 2017-10-16 19:50:53 -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
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
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
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
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
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
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
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
LetterJay
a5628fe332 Merge pull request #3423 from Citadel-Station-13/upstream-merge-31738 
[MIRROR] makes loaded templates call air_update_turf() on bordering turfs
 2017-10-16 07:25:52 -04:00
LetterJay
3c0c5db5d9 Update beam_rifle.dm 2017-10-16 06:14:24 -05:00
LetterJay
ee70d961d7 Update firing.dm 2017-10-16 06:13:51 -05:00
LetterJay
8a14bab2ee Update update_icons.dm 2017-10-16 06:10:06 -05:00
LetterJay
5dd348564a Merge pull request #3415 from Citadel-Station-13/upstream-merge-31690 
[MIRROR] You can smash the bulbs in floodlights
 2017-10-16 07:09:17 -04:00
LetterJay
74bc1be6c2 Merge pull request #3412 from Citadel-Station-13/upstream-merge-31705 
[MIRROR] Fixes tendril possession
 2017-10-16 07:08:02 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714 
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-16 07:06:37 -04:00