de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
0a6b755eff
Apotechary chem dispenser nerf. ( #12292 )
...
* Apotechary chem dispenser nerf.
* Spelling and build_path.
2020-05-24 13:20:32 -07:00
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
a84e7bcecc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-24 04:00:51 +02:00
9eccef2836
Porting "Personal interaction messages to simple animals" and more. ( #12268 )
...
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
2020-05-18 04:46:57 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
fc5d5fb087
Moving buttons away from windows.
2020-05-14 00:23:47 +02:00
1e0f30a446
[Map Edits] Minimal Piping/Device Fixes ( #12239 )
...
* map fixes
* reverting delta fix for PR conflict
2020-05-13 20:56:56 +02: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
2ce118f851
MetaStation atmos update ( #12099 )
...
* Finishes up meta station atmos
* Update MetaStation.dmm
2020-05-04 05:05:27 +02:00
6b4747d5fe
Meta station atmos opening up ( #12047 )
...
* Spawning area fix.
Part one of many
* Finishing up atmos
* Haha final fixes
* Security camera update
* Haha whoops, thanks lilly
2020-05-01 21:26:36 +02:00
c7b174676b
Add files via upload
2020-04-14 16:15:31 +00:00
94bcc6a64b
removes these
2020-04-13 14:38:30 -04: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
cb187dd944
corrections?
2020-04-07 07:36:20 -04: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
f735a2319a
it ( #11721 )
...
yeah
2020-04-04 00:47:18 +02:00
a8759b048e
smashes the tyranny of public mining
2020-03-31 23:32:15 +02: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
f2fe25d118
Updates maps with ruin border. Lowers ore gen on roids.
2020-02-25 17:33:18 +13:00
7889ea0d68
fix + maps
2020-02-20 22:58:43 -06:00
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
b3a530abc9
Merge pull request #11027 from ShadeAware/capsdrobe2
...
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
2020-02-13 09:40:22 +01:00
5afbe44be3
Attempt Numero Dos!
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -05:00
dccbb49626
Fixes
2020-02-10 11:59:14 -05:00
3f5805a9e8
Merge pull request #10798 from necromanceranne/secmainsrejoice
...
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
0779b67acc
whoops
2020-02-03 15:51:07 +11:00
07a4515b23
Thankfully I didn't fuck it up this way
2020-02-03 15:03:16 +11:00
ffa7590203
Status Displays should now actually work
2020-01-30 16:07:26 -06:00
95a2479c6a
Additional runtime fixes.
2020-01-24 04:59:56 +01:00
1ae106cca2
Fixes
2020-01-21 09:23:34 -05:00
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
98bb9397ea
fix cyborgs spawns
2020-01-16 21:05:51 -05:00
1413990ea2
Fix another TG snowflake variable.
2020-01-16 16:15:54 -05:00
a360a89f86
Map Changes
2020-01-16 15:10:57 -05:00
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
b41c9cd844
Sync with master
2020-01-08 12:25:22 +13:00
ec0596c404
Update
2019-12-23 18:52:33 -05:00
85ceda474e
Merge pull request #10218 from GrayRachnid/ADDS-MINERS
...
Adds gas miners to all maps.
2019-12-23 00:45:22 -08:00
d3a8025675
Wew
2019-12-22 02:17:24 -05:00
Ghommie