Commit Graph

7391 Commits

Author SHA1 Message Date
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
2f76bcde80 Merge pull request #3438 from Citadel-Station-13/upstream-merge-31763
[MIRROR] Raises starting GBP to 5
2017-10-17 08:53:52 -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
CitadelStationBot
6f124b5053 Fixes atmos machinery examine 2017-10-16 16:48:13 -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
CitadelStationBot
29e2366911 Trims ahelps 2017-10-16 16:48:04 -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
CitadelStationBot
2f6f7f8822 Raises starting GBP to 5 2017-10-16 15:12:00 -05:00
Cyberboss
66834cd3dc Changes starting PR balance to 5 2017-10-16 15:12:00 -05:00
CitadelStationBot
bcbd3fe67c Fixes godhand having no inhand sprite 2017-10-16 14:34:11 -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
c90a4b9ca0 Merge pull request #3435 from Citadel-Station-13/upstream-merge-31748
[MIRROR] Removed an outdated tip referring to construction permits
2017-10-16 14:13:00 -04: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
CitadelStationBot
b05ff5d901 Automatic changelog generation for PR #3414 [ci skip] 2017-10-16 13:12:30 -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
CitadelStationBot
16c851df45 Removed an outdated tip referring to construction permits 2017-10-16 12:49:32 -05:00
francinum
311de2f341 Removed an outdated tip referring to construction permits 2017-10-16 12:49:32 -05:00
CitadelStationBot
4ecb535e4a Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
AnturK
c85e760eac Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
LetterJay
531294c67b icons 2017-10-16 11:40:06 -05:00
CitadelStationBot
d695eb7513 Automatic changelog generation for PR #3433 [ci skip] 2017-10-16 09:40:08 -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
CitadelStationBot
72bf979330 Automatic changelog generation for PR #3431 [ci skip] 2017-10-16 09:40:01 -05: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
CitadelStationBot
021f09bdc1 Automatic changelog generation for PR #3421 [ci skip] 2017-10-16 09:39:52 -05: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
CitadelStationBot
e83213c7f4 Automatic changelog generation for PR #3430 [ci skip] 2017-10-16 09:39:44 -05: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
CitadelStationBot
4cbc851ed5 Fixed fancy boxes not showing proper content amount. 2017-10-16 07:15:04 -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
CitadelStationBot
d766664253 Automatic changelog generation for PR #3429 [ci skip] 2017-10-16 06:29:32 -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
ea4d097650 Merge pull request #3427 from Citadel-Station-13/upstream-merge-31719
[MIRROR] (s) Fixes invisible sink & urinal exploit
2017-10-16 07:29:11 -04:00
LetterJay
edcd751a4d Merge pull request #3426 from Citadel-Station-13/upstream-merge-31740
[MIRROR] Fixes the HoS's spider being air type instead of earth type (it's flying...)
2017-10-16 07:28:49 -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
CitadelStationBot
d6c12a026d Automatic changelog generation for PR #3418 [ci skip] 2017-10-16 06:27:32 -05: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
CitadelStationBot
ba756ea90f Automatic changelog generation for PR #3419 [ci skip] 2017-10-16 06:27:17 -05: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
ec41bbc420 Merge pull request #3422 from Citadel-Station-13/upstream-merge-31733
[MIRROR] closed turfs remove themselves from SSair.high_pressure_delta on change
2017-10-16 07:25:44 -04:00