 siliconsandGitHub
|
267186a5d3
|
Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
|
2020-07-20 16:15:38 -07:00 |
|
|
Cirno
|
bd289d0edb
|
more map changes...
|
2020-07-05 00:08:33 -03:00 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
|
Ghommie
|
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 |
|
|
Artur
|
882c11e0e5
|
This is every single onstation gateway r-r-ight?
|
2020-06-16 20:53:56 +03:00 |
|
|
Artur
|
bc30fb7710
|
Hard resets _maps to master
|
2020-06-16 16:09:05 +03:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
TrilbyspacecloneandGitHub
|
f42994c79b
|
Toxin tweaks! Just storage (#12363)
* Toxin tweaks
* bepis readd
* paintings
* Update DeltaStation2.dmm
* Fixed
|
2020-06-09 05:34:22 -07:00 |
|
|
Artur
|
094a1b6f62
|
More vr sleeper work and map fix
|
2020-06-09 11:06:16 +03:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
|
Ghommie
|
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 |
|
|
GhomandGitHub
|
0a6b755eff
|
Apotechary chem dispenser nerf. (#12292)
* Apotechary chem dispenser nerf.
* Spelling and build_path.
|
2020-05-24 13:20:32 -07:00 |
|
|
GhomandGitHub
|
293e3fea28
|
Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308)
|
2020-05-24 13:12:18 -07:00 |
|
|
GhomandGitHub
|
6756b564b7
|
Removing that one keg. (#12333)
|
2020-05-24 13:07:53 -07:00 |
|
|
GhomandGitHub
|
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 |
|
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
|
jjpark-kbandGitHub
|
cbc208375d
|
[Map Fix] Button and Wall (#12285)
|
2020-05-16 22:29:43 +02:00 |
|
|
Ghommie
|
fc5d5fb087
|
Moving buttons away from windows.
|
2020-05-14 00:23:47 +02:00 |
|
|
jjpark-kbandGitHub
|
1e0f30a446
|
[Map Edits] Minimal Piping/Device Fixes (#12239)
* map fixes
* reverting delta fix for PR conflict
|
2020-05-13 20:56:56 +02:00 |
|
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
|
kevinz000andGitHub
|
5a905b2f02
|
Fixes boxstation (#12236)
* revert
* ok
|
2020-05-13 03:15:17 +02:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
Ghommie
|
757706653d
|
Map paths.
|
2020-05-12 21:01:34 +02:00 |
|
|
Ghommie
|
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 |
|
|
MrJWhit
|
b5a18ccba5
|
should be good???
|
2020-05-11 00:09:25 -04:00 |
|
|
MrJWhitandGitHub
|
a5c3e3ff2b
|
Oh god please let this be the final boxstation update (#12089)
|
2020-05-03 03:53:44 +02:00 |
|
|
ZeroMan
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
ZeroMan
|
22d6ac78e1
|
i actually despise coding
|
2020-04-28 12:26:33 -04:00 |
|
|
ZeroMan
|
c5107f8fe0
|
i actually despise coding
|
2020-04-28 12:25:48 -04:00 |
|
|
ZeroMan
|
041d7ce4bc
|
i have committed warcrimes
|
2020-04-28 02:56:38 -04:00 |
|
|
ZeroMan
|
40f7472410
|
i actually despise coding
|
2020-04-28 02:47:28 -04:00 |
|
|
ZeroMan
|
8dc130175d
|
i actually despise coding
|
2020-04-28 02:46:46 -04:00 |
|
|
Artur
|
5d53ead547
|
Fucky wucky gateway and ccslab
|
2020-04-27 10:43:08 +03:00 |
|
|
bunny232
|
a245741f3e
|
Update BoxStation.dmm
|
2020-04-25 07:58:08 -04:00 |
|
|
MrJWhit
|
cc9d3b485a
|
Removes putnam upsetti mixer
|
2020-04-24 00:47:11 -04:00 |
|
|
Artur
|
67e0b95407
|
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
|
2020-04-23 12:36:42 +03:00 |
|
|
MrJWhit
|
8e7728c216
|
Reduce atmos suits, add pump to waste from mix, turn off air to waste pump
|
2020-04-22 14:18:00 -04:00 |
|
|
MrJWhit
|
286d1298fd
|
Fixes for atmos
Sure are some gosh dilly dang fixes
|
2020-04-21 22:44:07 -04:00 |
|
|
MrJWhit
|
f498fb106a
|
Update BoxStation.dmm
Aaaaah
|
2020-04-20 05:25:20 -04:00 |
|
|
MrJWhit
|
ba9d7c7dbc
|
Fixing up of boxstation
|
2020-04-18 17:12:16 -04:00 |
|
|
Ghommie
|
30268ed875
|
Removes pixel offsets from dorms lockers etcetera.
|
2020-04-14 03:05:32 +02:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
TrilbyspacecloneandGitHub
|
a6e07e5427
|
Merge branch 'master' into found_and_hidden
|
2020-04-07 03:37:09 -04:00 |
|
|
Kraseo
|
70859170c7
|
basically i fucking hate map merge conflicts
|
2020-04-04 16:32:45 +02:00 |
|
|
TrilbySpaceClone
|
62509ab4a9
|
the mapping side
|
2020-04-04 10:16:43 -04:00 |
|
|
Putnam3145andGitHub
|
ede3379a87
|
Merge pull request #11719 from Ghommie/Ghommie-cit662
Intellectual property infringment is not cool.
|
2020-04-02 06:18:41 -07:00 |
|