 Detective Google
|
9c049ef02b
|
more mapping fixes
|
2020-04-30 21:02:31 -05:00 |
|
|
Detective Google
|
e0fe368560
|
Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml
|
2020-04-30 20:25:54 -05:00 |
|
|
Detective Google
|
d0024575e7
|
fixes the non matching turf atmos (hopefully)
|
2020-04-30 20:25:51 -05:00 |
|
|
kevinz000
|
270f5ed168
|
fix
|
2020-04-30 18:15:43 -07:00 |
|
|
Detective Google
|
8cd5b4ff4a
|
fixes solars + removes the space tiles in the toxins burn chamber
|
2020-04-30 19:21:53 -05:00 |
|
|
Detective-Google
|
c146c898c0
|
Merge branch 'master' into 91-files-changed-fml
|
2020-04-30 18:42:38 -05:00 |
|
|
Detective Google
|
41d1dd1763
|
fixes the maps
|
2020-04-30 18:13:02 -05: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 |
|
|
kevinz000
|
f028672e3c
|
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
|
2020-04-30 01:00:08 -07:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
1d12aa5779
|
Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors
Kilo station improvements
|
2020-04-29 11:59:26 -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 |
|
|
TrilbySpaceClone
|
39e460d795
|
Kevs request
|
2020-04-27 07:16:00 -04:00 |
|
|
kevinz000
|
6ff9d54e4f
|
Merge pull request #11947 from MrJWhit/vg-atmos-box
Ports /vg/ atmos map for boxstation
|
2020-04-25 17:01:34 -07:00 |
|
|
bunny232
|
a245741f3e
|
Update BoxStation.dmm
|
2020-04-25 07:58:08 -04:00 |
|
|
Ghom
|
a831b3b623
|
Merge pull request #11995 from MrJWhit/fixes-to-pubby-engine
Quick fixing up of pubbystation things
|
2020-04-24 21:29:32 +02:00 |
|
|
TrilbySpaceClone
|
a3379089a6
|
Decal delete
|
2020-04-24 11:26:21 -04:00 |
|
|
Detective Google
|
71be8ed2fc
|
ports all the tg junk for icemoon, not yet changed to make it all compile
|
2020-04-24 00:02:03 -05:00 |
|
|
MrJWhit
|
cc9d3b485a
|
Removes putnam upsetti mixer
|
2020-04-24 00:47:11 -04:00 |
|
|
MrJWhit
|
100d7cffd2
|
Also fix that one maint door to be a maint door
|
2020-04-23 19:20:43 -04:00 |
|
|
MrJWhit
|
037ea6e073
|
fixing up the engine
|
2020-04-23 18:26:39 -04:00 |
|
|
MrJWhit
|
a621474ae7
|
Adds a missing wire and a second SMES to the AI sat
|
2020-04-23 18:10:56 -04:00 |
|
|
TrilbySpaceClone
|
c8b3032087
|
Merge branch 'master' into cube-world
|
2020-04-23 02:04:56 -04: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 |
|
|
nik707
|
5e1c6ae58e
|
Merge pull request #11945 from EmeraldSundisk/cogfix2.1
Cogfix2.1
|
2020-04-21 09:23:16 -05:00 |
|
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
|
MrJWhit
|
f498fb106a
|
Update BoxStation.dmm
Aaaaah
|
2020-04-20 05:25:20 -04:00 |
|
|
EmeraldSundisk
|
10d8ef79db
|
Update CogStation.dmm
|
2020-04-19 20:33:35 -07:00 |
|
|
TrilbySpaceClone
|
d98f536003
|
map fix + cube fix
|
2020-04-19 19:38:23 -04:00 |
|
|
MrJWhit
|
ba9d7c7dbc
|
Fixing up of boxstation
|
2020-04-18 17:12:16 -04:00 |
|
|
kevinz000
|
038cb5c911
|
Merge pull request #11849 from Ghommie/Ghommie-cit680
Removes pixel offsets from box dorms lockers/dressers etcetera.
|
2020-04-17 05:09:37 -07:00 |
|
|
Ghom
|
044d360d20
|
Merge pull request #11877 from Detective-Google/lambda-fixes
Fixes a bunch of gripes people had with lambda.
|
2020-04-17 08:55:14 +02:00 |
|
|
Detective Google
|
78527739e3
|
moves a tiny fan away from the very angry ball of lightning
|
2020-04-16 17:21:25 -05:00 |
|
|
Detective Google
|
16b02495ae
|
fixes the exe- valid room not being wired to the grid
|
2020-04-16 16:21:43 -05:00 |
|
|
Detective Google
|
c7f7012eb2
|
adds more grounding rods (due to reported tesla issues), fixes emitter wire
|
2020-04-16 01:03:12 -05:00 |
|
|
Detective Google
|
6f82440107
|
fixes a bunch of junk
|
2020-04-15 23:22:39 -05:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
UristMcAstronaut
|
b6bbe1738e
|
Add files via upload
|
2020-04-14 16:57:34 +00:00 |
|
|
UristMcAstronaut
|
c7b174676b
|
Add files via upload
|
2020-04-14 16:15:31 +00:00 |
|
|
Ghommie
|
30268ed875
|
Removes pixel offsets from dorms lockers etcetera.
|
2020-04-14 03:05:32 +02:00 |
|
|
kappa-sama
|
94bcc6a64b
|
removes these
|
2020-04-13 14:38:30 -04:00 |
|
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
|
Ghom
|
f0c9a15fdb
|
Merge pull request #11762 from Kraseo/whoopsie
hey guess who forgot about kilo's public mining shuttle dock
|
2020-04-12 06:29:05 +02:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|