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

5203 Commits

Author SHA1 Message Date
LetterJay
6fe6c4ca63 Merge pull request #3467 from Citadel-Station-13/upstream-merge-31803 
[MIRROR] Fixes disabling leg actuators not setting power drain per step to the correct value
 2017-10-18 07:36:31 -04:00
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
CitadelStationBot
7f9d13ab42 [MIRROR] Removes 200mb of wasted memory usage (#3472) 
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again

Removes 200mb of wasted memory usage

* Removes 200mb of wasted memory usage
 2017-10-17 22:18:19 -05:00
Y0SH1M4S73R
5b57ba97ac Fixes disabling leg actuators not setting power drain per step to the correct value (#31803) 
* Adds the normal_step_energy_drain var to mechs

* Disabling leg overload sets step_energy_drain to normal_step_energy_drain instead of calling initial
 2017-10-17 13:34:53 -05: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
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
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
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
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
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
35c80edc7a Update pump.dm 2017-10-16 20:52:33 -05:00
LetterJay
5ae1b16d6c Update airlock.dm 2017-10-16 20:52:19 -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
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