96878c28cf
Update BoxStation.dmm
2021-07-22 15:12:41 -04:00
b2ccb22888
fixing theater access and adding a whoopsie light
2021-07-22 15:09:44 -04:00
46937f67ce
areas
2021-07-06 23:00:34 -04:00
b09d305f1d
I hate APCs
2021-07-01 00:35:26 -04:00
7ebee01f70
another room
2021-07-01 00:14:49 -04:00
8ca5b7624d
Update BoxStation.dmm
2021-06-30 23:45:46 -04:00
36de878d54
I hate APCs, did you know that?
2021-06-30 22:52:27 -04:00
d5edba7d7e
WAITSHITFUCK
2021-06-30 22:46:18 -04:00
d3056e3f84
Boxstation rooms 'n stuff
2021-06-30 22:26:18 -04:00
547b04dfac
Automatic changelog compile [ci skip]
2021-07-01 00:25:11 +00:00
3cde84ff5f
Automatic changelog compile [ci skip]
2021-06-30 00:22:37 +00:00
d94ecfc4b4
Automatic changelog generation for PR #14904 [ci skip]
2021-06-29 15:11:31 -05:00
05019b5ce1
Merge pull request #14904 from WanderingFox95/WanderingFox95-VaultFix2
...
[Hopefully Fixed] Vault Rebalance on Boxstation
2021-06-29 13:11:28 -07:00
5dab84ad81
Okay, let's try this again.
...
I don't like you, you don't like me,
can we please just get along?
2021-06-29 18:30:04 +02:00
90bdd55319
Automatic changelog generation for PR #14883 [ci skip]
2021-06-29 10:51:26 -05:00
a00ed83c5e
Merge pull request #14883 from WanderingFox95/WanderingFox95-plushies
...
[Ready] The plushie PR you didn't know we needed (but we kinda did)
2021-06-29 08:51:24 -07:00
f3e44b1cf4
Automatic changelog generation for PR #14899 [ci skip]
2021-06-29 10:51:13 -05:00
a29d107d33
Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop
...
Moves tendril KA upgrade disks to blood drunk miner.
2021-06-29 08:51:10 -07:00
2171e9a145
Automatic changelog generation for PR #14893 [ci skip]
2021-06-29 10:50:50 -05:00
22ad8f2c8c
Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
...
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
708f98c78f
Automatic changelog generation for PR #14861 [ci skip]
2021-06-29 10:49:57 -05:00
e04c940819
Merge pull request #14861 from bunny232/pubbymos
...
Pubby xenobiology atmospherics update among other things
2021-06-29 08:49:54 -07:00
905889eb0d
Automatic changelog generation for PR #14895 [ci skip]
2021-06-29 10:48:57 -05:00
c7766b0f02
Merge pull request #14895 from shellspeed1/another-pod
...
Adds a new survival pod, the penthouse pod.
2021-06-29 08:48:55 -07:00
3bd4cbbab4
Automatic changelog generation for PR #14822 [ci skip]
2021-06-29 10:46:37 -05:00
f4c6888f96
Merge pull request #14822 from qweq12yt/more-cargo-features
...
Solving inconsistencies regarding QM being command
2021-06-29 08:46:33 -07:00
26cb16311d
A
2021-06-27 20:08:33 -07:00
392111dc74
Automatic changelog compile [ci skip]
2021-06-28 00:24:16 +00:00
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
0f3bd03a66
Automatic changelog generation for PR #14892 [ci skip]
2021-06-27 13:02:09 -05:00
505fa13631
Merge pull request #14892 from WanderingFox95/WanderingFox95-GooglyEyes
...
[Ready] Googly Eyes! (Hydroponics)
2021-06-27 11:02:07 -07:00
5818c35604
Automatic changelog generation for PR #13991 [ci skip]
2021-06-27 13:01:35 -05:00
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
11ce23ae79
Automatic changelog generation for PR #14896 [ci skip]
2021-06-27 09:39:34 -05:00
a7765aed6f
Fixes shoddy math & assumptions causing APCs in sufficiently high-power-requiring rooms to work forever ( #14896 )
...
* Fixes shoddy math & assumptions causing bad
* i typed it. i know it did.
2021-06-27 16:39:32 +02:00
d6b69b2800
The actual map
2021-06-27 03:39:21 -07:00
f52385ca46
all the stuff to add pod to code
2021-06-27 03:39:13 -07:00
bfcefc75fa
Automatic changelog compile [ci skip]
2021-06-27 00:26:23 +00:00
d2dc56123d
Minor backend cleanup
2021-06-26 07:13:17 -07:00
6d4d70298d
Wow It's Been At Double Speed
2021-06-25 07:30:27 -07:00
b22944cde6
minor optimizations
2021-06-25 06:54:36 -07:00
eb74ad2137
And a recipe.
...
You attach a newspaper to a telebaton with tape.
2021-06-25 11:39:22 +02:00
9bd1433bbe
Adds a child item to the telebaton
...
identical stats for the future but different looks.
2021-06-25 11:38:21 +02:00
c67edd2dc5
Adds a rolled up newspaper sprite
2021-06-25 11:36:59 +02:00
1ad824b72d
Automatic changelog compile [ci skip]
2021-06-25 00:25:05 +00:00
2064da4842
Merge pull request #14887 from MrJWhit/teg-reinforced-floors
...
Swapping some floors on the TEG-map
2021-06-24 14:45:53 -07:00
ca70d8afa4
Automatic changelog generation for PR #14891 [ci skip]
2021-06-24 16:45:13 -05:00
13572fd109
Merge pull request #14891 from MrJWhit/random-5x5-SM-fix
...
The most important map update for the 5x5 SM.
2021-06-24 14:45:11 -07:00
0c5aa60878
Automatic changelog generation for PR #14662 [ci skip]
2021-06-24 13:25:20 -05:00
MrJWhit