Commit Graph

7367 Commits

Author SHA1 Message Date
francinum
311de2f341 Removed an outdated tip referring to construction permits 2017-10-16 12:49:32 -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
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
11769ef9f8 Update other_mobs.dm 2017-10-16 06:13:41 -05:00
LetterJay
8a14bab2ee Update update_icons.dm 2017-10-16 06:10:06 -05:00
LetterJay
a11a474a94 Merge pull request #3416 from Citadel-Station-13/upstream-merge-31698
[MIRROR] Prevents tiles from being placed on top of buckled mobs
2017-10-16 07:09:30 -04:00
CitadelStationBot
0bfcd0063e Automatic changelog generation for PR #3415 [ci skip] 2017-10-16 06:09:18 -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
CitadelStationBot
262fc912e3 Automatic changelog generation for PR #3413 [ci skip] 2017-10-16 06:08:13 -05:00
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695
[MIRROR] Makes directional windows only block air if anchored
2017-10-16 07:08:11 -04:00
CitadelStationBot
cf9aff2995 Automatic changelog generation for PR #3412 [ci skip] 2017-10-16 06:08:04 -05: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
CitadelStationBot
10bd0868a9 Automatic changelog generation for PR #3411 [ci skip] 2017-10-16 06:06:38 -05: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
LetterJay
029d98028a Merge pull request #3410 from Citadel-Station-13/upstream-merge-31713
[MIRROR] Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-16 07:06:28 -04:00
CitadelStationBot
aaa0a1aff3 Automatic changelog generation for PR #3409 [ci skip] 2017-10-16 06:06:20 -05:00
LetterJay
93380bcdb6 Merge pull request #3409 from Citadel-Station-13/upstream-merge-31709
[MIRROR] Readds the boxstation whiteship as a ruin.
2017-10-16 07:06:18 -04:00
vuonojenmustaturska
11eff73897 Removes hardcoded "full bottle" icons from several pre-filled reagent bottles 2017-10-16 00:00:52 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
CitadelStationBot
dda7d8c022 EI NATH! now causes a flash of light 2017-10-15 21:04:14 -05:00
MoreRobustThanYou
1b7cd05752 EI NATH! now causes a flash of light (#31691)
i've been reading too much harry potter
2017-10-15 21:04:14 -05:00
CitadelStationBot
fa21b74062 Removes mapping error bandaid 2017-10-15 21:02:02 -05:00
Jordan Brown
baf8b578f5 Removes mapping error bandaid (#31710)
* Removes mapping error bandaid

* Update conversion code
2017-10-15 21:02:02 -05:00