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

2053 Commits

Author SHA1 Message Date
CitadelStationBot
dd735fb2eb [MIRROR] Makes changelings vomitting acid on things actually leave a puddle of acid (#3522) 
* Changeling vomit (#31878)

* Makes changelings vomitting acid on things actually leave a puddle of acid
 2017-10-21 06:15:06 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
d511bc1fde [MIRROR] Fixes bombs on Reebe being an instant win (#3518) 
* Fixes bombs on Reebe being an instant win (#31503)

* Probably reduces Reebe bombcap

* wat

* TTV warning

* Less awkward wording

* Fixes bombs on Reebe being an instant win
 2017-10-21 03:47:07 -05:00
CitadelStationBot
0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
CitadelStationBot
46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513) 
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
 2017-10-20 01:40:15 -05:00
LetterJay
72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819 
[MIRROR] Fixes AI visiblity checks
 2017-10-19 09:24:28 -04:00
LetterJay
fe05d8aaaf Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754 
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
 2017-10-19 09:24:04 -04:00
LetterJay
e876293476 Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773 
[MIRROR] Showers clean contamination and make sound
 2017-10-19 09:20:02 -04:00
LetterJay
7ca5646119 Merge pull request #3497 from Citadel-Station-13/upstream-merge-31711 
[MIRROR] Removes crewpinpointer from wardens locker
 2017-10-19 09:14:00 -04:00
LetterJay
02f0c1573a Merge pull request #3491 from Citadel-Station-13/upstream-merge-31851 
[MIRROR] Fixes liches not blocking roundend properly.
 2017-10-19 09:08:25 -04:00
LetterJay
9076721384 Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842 
[MIRROR] GPS renaming fix
 2017-10-19 09:05:18 -04:00
LetterJay
cf73ddcdbb Merge pull request #3489 from Citadel-Station-13/upstream-merge-31847 
[MIRROR] Fixes a misnamed arg in a clockwork proc
 2017-10-19 09:02:40 -04:00
LetterJay
b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753 
[MIRROR] Radiation makes you vomit blood and some more balance changes
 2017-10-19 08:57:18 -04:00
LetterJay
626993d116 Merge pull request #3480 from Citadel-Station-13/upstream-merge-31836 
[MIRROR] Fixes recipient in pda logs
 2017-10-19 08:56:25 -04:00
YPOQ
d04818e6f9 Fixes AI visiblity checks (#31819) 2017-10-19 05:42:52 -05:00
vuonojenmustaturska
7045809aa2 Stops manned turrets from firing when the user unbuckles themselves from the turret (#31754) 
* The clown is drunk, and the cards of death wait on him

* Update power.dm
 2017-10-19 05:41:41 -05:00
Poojawa
45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -05:00
Emmett Gaines
ee3d18fe58 Showers clean contamination and make sound (#31773) 
* fucking showers

* cleanup
 2017-10-19 03:29:08 -05:00
jughu
25c37ac9bb Removes crewpinpointer from wardens locker (#31711) 
* Update security.dm

* Update security.dm
 2017-10-19 02:02:25 -05:00
AnturK
daeffc5b03 Fixes liches not blocking roundend properly. (#31851) 2017-10-18 18:27:14 -05:00
Robustin
1945f16dee Bad Argument Runtime Removed 2017-10-18 11:56:09 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
Leo
29e20a55de Merge pull request #31842 from GunHog/GPS_Name_Fix 
GPS renaming fix
 2017-10-18 07:23:31 -05:00
Leo
060d43768e Merge pull request #31836 from AnturK/pdalogfix 
Fixes recipient in pda logs
 2017-10-18 07:23:12 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630 
[MIRROR] Datum rev & related upgrades to base datum antag
 2017-10-18 07:42:54 -04:00
LetterJay
799e52c5b0 Merge pull request #3479 from Citadel-Station-13/upstream-merge-31838 
[MIRROR] Fixes foam layer popping
 2017-10-18 07:42:48 -04:00
LetterJay
92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809 
[MIRROR] Cleans up some istypes not using helpers
 2017-10-18 07:37:43 -04:00
LetterJay
b89142a35b Merge pull request #3471 from Citadel-Station-13/upstream-merge-31810 
[MIRROR] Fixes being able to pick up brass chairs
 2017-10-18 07:37:05 -04:00
LetterJay
481a3ef518 Merge pull request #3470 from Citadel-Station-13/upstream-merge-31788 
[MIRROR] Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles.
 2017-10-18 07:36:55 -04:00
LetterJay
9e5c84372a Merge pull request #3469 from Citadel-Station-13/upstream-merge-31793 
[MIRROR] Fixes slapper inhand
 2017-10-18 07:36:45 -04:00
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
271a287b52 Merge pull request #3461 from Citadel-Station-13/upstream-merge-31795 
[MIRROR] Random runtime fixes.
 2017-10-18 07:35:03 -04:00
Leo
3894b463bf Merge pull request #31838 from ShizCalev/foam-layer-fix 
Fixes foam layer popping
 2017-10-18 05:16:52 -05:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05: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
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
Ashe Higgs
13d8414369 Fixes being able to pick up brass chairs (#31810) 2017-10-17 15:33:23 -05:00
ShizCalev
272fcc0b5d Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles. (#31788) 
* Stops plating types from stating rod holes

* More immersion. Stops building ontop with rods.
 2017-10-17 13:37:25 -05:00
ShizCalev
bcb077a526 Fixes slapper inhand (#31793) 2017-10-17 13:36:17 -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
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes 
Random runtime fixes.
 2017-10-17 09:20:55 -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
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
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
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
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
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