9849b9a13b
Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482
...
[MIRROR] Improves the deep fryer
2017-11-15 11:13:56 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
5f8d368d9f
Fix bluespace shelters smoothing with non-shelter walls ( #32526 )
2017-11-09 11:07:15 -06:00
2f21f16b53
initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT
2017-11-08 17:04:20 -05:00
3bae5fcef1
Merge pull request #3832 from Citadel-Station-13/upstream-merge-32427
...
[MIRROR] Cleans up wire varedits
2017-11-07 04:45:12 -06:00
b89cedcb08
Cleans up wire varedits ( #32427 )
2017-11-05 17:36:31 -06:00
cc438ea9b4
Refactors and improvements to xenobio slime processor ( #32406 )
...
* Do not let your memes be dreams
* static lists for great justice
* Local man forgets to capitalize a word
* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
5113a71cff
Merge pull request #3807 from Citadel-Station-13/upstream-merge-32403
...
[MIRROR] Removes Freon preset gas filters from all maps
2017-11-04 22:54:06 -05:00
f81f3b7262
Merge pull request #3805 from Citadel-Station-13/upstream-merge-32390
...
[MIRROR] Fixes wrong locker IDs in pubby security cells
2017-11-04 22:53:09 -05:00
1aa42f1490
Merge pull request #3803 from Citadel-Station-13/upstream-merge-32391
...
[MIRROR] Expands ancient station map areas.
2017-11-04 22:51:56 -05:00
cd9bab3052
Merge pull request #3799 from deathride58/furtherboxedits
...
Boxstation Edits: Legless Warden edition
2017-11-04 22:50:58 -05:00
b1b69d107b
Removes Freon preset gas filters from all maps ( #32403 )
2017-11-04 14:24:35 -05:00
3b69610dca
Merge pull request #32390 from ShizCalev/pubby-locker-fix
...
Fixes wrong locker IDs in pubby security cells
2017-11-04 13:08:12 -05:00
1e32be17ec
Expands ancient station map areas ( #32391 )
2017-11-04 11:20:21 -05:00
43dcaed39e
Blech
2017-11-04 01:18:23 -04:00
961991f7e4
github for windows is an amazing git client
2017-11-04 00:56:31 -04:00
1c38ebd9e4
tons of map changes to go around
2017-11-04 00:55:56 -04:00
a3783943a7
Internal map improvements ( #32310 )
...
* Internal map improvements
* More map sheet fixes
* PubbyStation fix
* More map fixes
2017-11-02 01:23:30 -05:00
771cce48ad
Merge pull request #32182 from AutomaticFrenzy/patch/raven
...
Fix improper diagonal corners on the Raven shuttle
2017-10-31 15:13:52 -05:00
3c08b5e4ca
Merge pull request #3676 from Citadel-Station-13/upstream-merge-32189
...
[MIRROR] Makes the atmos table accessible in MetaStation
2017-10-29 23:37:44 -04:00
98a9c8933f
fixes the table ( #32189 )
2017-10-29 10:57:34 -05:00
27492e891f
Map config cleanup ( #32132 )
...
* Map config cleanup
* Fix
2017-10-27 17:35:05 -05:00
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
02623b8e59
Merge pull request #3614 from Citadel-Station-13/upstream-merge-32057
...
[MIRROR] Makes luxurious emergency shuttle noteleport
2017-10-26 14:21:48 -04:00
1df0bc16a4
Merge pull request #3608 from Citadel-Station-13/upstream-merge-32082
...
[MIRROR] Fixes pipe runtime
2017-10-26 14:21:07 -04:00
dbba59e0b5
Makes luxurious emergency shuttle noteleport
2017-10-25 23:39:41 -05:00
6316c0d989
Fixes pipe runetime
2017-10-25 23:32:40 -05:00
6235c66517
Merge pull request #32070 from ShizCalev/delta-vent
...
Corrects disabled vent in delta toxins lab.
2017-10-25 18:55:54 -05:00
2fc3636360
FUCK part 3 - fixes gravity generator assmos and also makes nonlethal armory look less like ass while im at it
2017-10-23 18:12:26 -04:00
0a3f908a7b
FUCK - fixes brig wiring
2017-10-23 17:33:04 -04:00
cfb6f98c3c
FIXES RWALL YES THIS IS NECESSARY FUCK
2017-10-23 15:58:33 -04:00
ec6b7770c9
merges #3577
2017-10-23 15:47:43 -04:00
c77421ec4a
EMERGENCY BOX CLOWN/MIME OFFICE HOTFIX
2017-10-23 15:36:51 -04:00
6ead40bcee
Boxstation security changes
2017-10-23 14:43:05 -04:00
268c80dc66
fixes areas, other small changes
2017-10-23 14:26:05 -04:00
c6150a0819
Boxstation major non-security map changes
2017-10-23 14:10:23 -04:00
bc3e8968ab
Deltastation + Metastation map changes
2017-10-23 13:41:57 -04:00
930f6405b2
Map syncs 1 - initial commit, hard sync with TG
2017-10-23 12:47:38 -04:00
1a94726bdc
[MIRROR] Fixes conflicting IDs on ruined whiteship ( #3525 )
...
* Fixes conflicting IDs
* Fixes conflicting IDs on ruined whiteship
2017-10-21 03:44:47 -05:00
2e430ec33c
Merge pull request #3488 from Citadel-Station-13/upstream-merge-31814
...
[MIRROR] Adds missing petbed on Meta
2017-10-19 09:02:05 -04:00
592f6d89f2
Adds missing petbed on Meta
2017-10-18 11:54:56 -05:00
04d26d561a
Radiation makes you vomit blood and more balance changes ( #31753 )
2017-10-18 09:25:11 -05:00
9e61ff1333
Merge pull request #3468 from Citadel-Station-13/upstream-merge-31791
...
[MIRROR] Fixes mapping issues introduced in #30909
2017-10-18 07:37:35 -04:00
da43e2cd46
Update DeltaStation2.dmm
2017-10-18 06:26:51 -05:00
df524ddaa6
Fixes mapping issues introduced in #30909
2017-10-17 13:36:08 -05:00
d43de80540
Corrects caravan ambush tool speed ( #31792 )
...
* Corrects caravan ambush tool speed
* subtype
2017-10-17 08:22:07 -05:00
89fbf077d9
Fixes missing semicolon in sargeant araneus vars ( #31790 )
...
* semicolon
* no define
2017-10-16 22:55:31 -05:00
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
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