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
ee1cb5f8c5
yay fixes ( #11756 )
2020-04-06 17:51:07 +02:00
09c8bd40ec
Merge pull request #11575 from EmeraldSundisk/coggers
...
as of yet unfinished, being added in the background for ease of further development
2020-04-04 13:18:07 -05:00
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
f735a2319a
it ( #11721 )
...
yeah
2020-04-04 00:47:18 +02:00
baa320d16f
Add files via upload
2020-04-03 12:38:26 -07: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
6f4281b4b8
Even More fixes to Lambda ( #11604 )
...
* Update lambda.dmm
even MORE fixes
* Update lambda.dmm
some more vents in maintenance, air canisters, and mystery coin
* Update lambda.dmm
more shit
* darn you ghommie
hopefully fixes conflicts
* Create lambda.dmm
okay, let's try this
* Update lambda.dmm
fingers crossed
2020-04-01 16:19:10 +02:00
b5f1cbd3d0
Merge pull request #11683 from timothyteakettle/wrestling_holodeck
...
holodeck WRESTLING
2020-03-31 18:03:00 -07:00
a8759b048e
smashes the tyranny of public mining
2020-03-31 23:32:15 +02:00
658701bf37
Various ghost role QoL; moving holding facility; removing energy net ( #11676 )
...
* Removed gay baby jail net from ninja
* Made a proper holding facility for syndicate contractors
* Made ghost role eligibility able to allow reghosting.
* Added a medibot to the holding facility.
* Added new comsigs to every other ghost proc
* Properly dummied out capture objective
2020-03-31 22:04:55 +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
2caeaba8dc
moves two tables
2020-03-29 14:17:00 +01:00
b89a6b0398
makes everything work
2020-03-29 02:44:44 +01:00
5afe5aab3f
fixes the map, adds subtype of martial art
2020-03-29 00:46:18 +00:00
818d7b2ebf
initial wrestling arena
2020-03-28 23:13:24 +00:00
ac93fecf2c
Add files via upload
2020-03-27 19:46:04 -07:00
5933563485
one line fix to a box mapping issue
2020-03-27 13:43:28 +01:00
a96857a401
Update CogStation.dmm
2020-03-26 08:54:08 -07: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
4f8e36ebd6
Update CogStation.dmm
2020-03-24 16:50:46 -07:00
a000220157
Update CogStation.dmm
2020-03-23 12:46:39 -07: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
9337536897
Update CogStation.dmm
2020-03-22 22:05:16 -07:00
7776fff850
Lavaland change
...
Revert
2020-03-22 16:00:24 -04:00
830f646383
Revert "Merge pull request #11225 from r4d6/Random-Mining"
...
This reverts commit ea5774e713
2020-03-22 15:55:08 -04:00
0a539949a0
Update CogStation.dmm
2020-03-22 10:19:13 -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
f530f2f45c
haha
...
bamda is updoot
2020-03-22 04:31:28 -06:00
624916ff18
Add files via upload
2020-03-21 20:09:34 -07:00
e320ad7830
Various Fixes to Lambdastation
...
haha imaigne having it right the first time when no one tested it with me
2020-03-21 19:12:07 -06:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
b384982a92
Update CogStation.dmm
2020-03-21 17:12:17 -07:00
82a4121807
Merge pull request #11512 from dapnee/Lambdastation
...
Fuck it, Lambda Station, here we go!
2020-03-20 22:46:45 -07: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
bc6b217565
minimapfix
2020-03-19 15:27:54 -07:00
ab7fc2dc72
me and the boys stealing prs ( #11517 )
...
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
2020-03-19 13:38:31 +01:00
4f63b3dd09
Update CogStation.dmm
2020-03-18 16:59:38 -07:00
6855d2d9a4
Let's try this again.
2020-03-18 14:29:34 -07:00
fc1416d237
Create FOLDER.txt
2020-03-18 14:18:35 -07:00
9b71b1a9a2
Merge pull request #11511 from EmeraldSundisk/cogshuttles
...
Let's just start with the shuttles.
2020-03-18 14:37:27 -05:00
b113166c3e
Merge pull request #11506 from zeroisthebiggay/kevinzdemandsthefix
...
Big Box Brig Boogaloo (kevinzs requests and stuffs)
2020-03-18 03:35:08 -07:00
f144e8fc37
Update lambda.dmm
...
fixes a couple issues
2020-03-17 21:07:20 -06:00
kevinz000