e0f1b65785
Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry
...
Moves fire alarm in box station in the chem department
2020-05-12 12:28:41 -07:00
757706653d
Map paths.
2020-05-12 21:01:34 +02:00
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
b5a18ccba5
should be good???
2020-05-11 00:09:25 -04:00
a5c3e3ff2b
Oh god please let this be the final boxstation update ( #12089 )
2020-05-03 03:53:44 +02:00
52b7086876
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics
...
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
2020-04-30 13:48:48 -04:00
619609f5ff
Merge pull request #12020 from bunny232/master
...
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
2020-04-29 12:01:11 -07:00
22d6ac78e1
i actually despise coding
2020-04-28 12:26:33 -04:00
c5107f8fe0
i actually despise coding
2020-04-28 12:25:48 -04:00
041d7ce4bc
i have committed warcrimes
2020-04-28 02:56:38 -04:00
40f7472410
i actually despise coding
2020-04-28 02:47:28 -04:00
8dc130175d
i actually despise coding
2020-04-28 02:46:46 -04:00
a245741f3e
Update BoxStation.dmm
2020-04-25 07:58:08 -04:00
cc9d3b485a
Removes putnam upsetti mixer
2020-04-24 00:47:11 -04:00
8e7728c216
Reduce atmos suits, add pump to waste from mix, turn off air to waste pump
2020-04-22 14:18:00 -04:00
286d1298fd
Fixes for atmos
...
Sure are some gosh dilly dang fixes
2020-04-21 22:44:07 -04:00
f498fb106a
Update BoxStation.dmm
...
Aaaaah
2020-04-20 05:25:20 -04:00
ba9d7c7dbc
Fixing up of boxstation
2020-04-18 17:12:16 -04:00
30268ed875
Removes pixel offsets from dorms lockers etcetera.
2020-04-14 03:05:32 +02:00
b8548f521b
Merge pull request #11746 from Trilbyspaceclone/found_and_hidden
...
Atomic PR 1 or 2 - Toilet Mapping!
2020-04-09 02:11:43 -07:00
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
a6e07e5427
Merge branch 'master' into found_and_hidden
2020-04-07 03:37:09 -04:00
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
62509ab4a9
the mapping side
2020-04-04 10:16:43 -04:00
ede3379a87
Merge pull request #11719 from Ghommie/Ghommie-cit662
...
Intellectual property infringment is not cool.
2020-04-02 06:18:41 -07:00
e50fe8b061
Removing a trademark from the game.
2020-04-02 14:48:43 +02:00
a8759b048e
smashes the tyranny of public mining
2020-03-31 23:32:15 +02:00
f4d304bfcf
I FORGOT TO RE-ADD HOOCHMASTER AGAIN
...
HOW COULD I DO THIS poor hoochmaster I am so so sorry this is the second time I am sorry bartender mains.
2020-03-30 01:29:44 +01:00
3f800c179c
map merged should be no conflicts?
2020-03-30 01:08:45 +01:00
d27c802859
wait so I literally copied from master and did stuff again and it has merge conflicts, do not merge until another commit goes through
2020-03-30 00:44:59 +01:00
b52f8148cb
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
2020-03-30 00:32:31 +01:00
b3750207e9
Merge Conflicts
...
Changes redone.
2020-03-30 00:11:34 +01:00
5933563485
one line fix to a box mapping issue
2020-03-27 13:43:28 +01:00
4199792576
Boxstation secmos is no longer connected to the scrubber loop ( #11630 )
...
* Update BoxStation.dmm
* Update BoxStation.dmm
2020-03-26 15:45:30 +01:00
52138696d0
PROTO KINETIC dream CRUSHER
...
oh yeah give me all the shutters daddy
2020-03-26 13:08:37 +00:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
80baf85300
Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics ( #11543 )
...
* Maps Bumbles in for once
* Hopefully fixes merge conflicts?
2020-03-22 13:13:40 +01:00
043de9dcd2
Removes the roundstart syringe guns on each map, replacing them with medidart guns. ( #11560 )
...
* nukes roundstart syringe guns for roundstart dart guns.
* fixes the delta and meta maint syringes to have an identical change.
* brings lambda up to date with master.
2020-03-22 13:11:37 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
5d8f6163d5
fixes a box oopsies ( #11532 )
...
* apparently i forgot them
* and also map merge
* two more minor issues
* and also map merge
2020-03-21 01:48:01 +01:00
4e6dd9eed0
and all comes tumbling
2020-03-16 15:06:29 -04:00
2e866691e1
i hate my life
2020-03-16 15:05:35 -04:00
29d1eaf81d
and i wanna die
2020-03-16 14:36:20 -04:00
cf3812d222
and i wanna die
2020-03-16 14:35:36 -04:00
faa5a93510
Fixed missing pipe by box vault ( #11488 )
...
* Update BoxStation.dmm
* Update BoxStation.dmm
2020-03-16 16:23:11 +01:00
8da4521a91
and i hate lawyers
2020-03-15 16:16:49 -04:00
6968e94b06
and maybe it works
2020-03-15 12:58:33 -04:00
a1f4c0232e
a i wanna die
2020-03-15 12:57:55 -04:00
107a9fa2d2
and map merge exists
2020-03-15 11:29:49 -04:00
82b63081f6
a couple more tweaks
2020-03-15 11:28:57 -04:00
kevinz000