Commit Graph

2042 Commits

Author SHA1 Message Date
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
Poojawa
45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -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
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
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
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
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
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
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
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
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
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
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