 LinandGitHub
|
f745c59fad
|
Merge pull request #11968 from MrJWhit/TEG-heat-go-away
teg map hot no hot room plz
|
2020-04-25 03:28:00 +00:00 |
|
|
GhomandGitHub
|
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 |
|
|
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
|
eafdae5e66
|
Swaps out some catwalks for latices to make travis happy
|
2020-04-22 14:01:11 -04:00 |
|
|
MrJWhit
|
4fc041d4f4
|
teg hot no hot
aaaaaaah
|
2020-04-21 19:43:38 -04:00 |
|
|
nik707andGitHub
|
5e1c6ae58e
|
Merge pull request #11945 from EmeraldSundisk/cogfix2.1
Cogfix2.1
|
2020-04-21 09:23:16 -05:00 |
|
|
GhomandGitHub
|
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 |
|
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
GhomandGitHub
|
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
|
ec452de0b2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 08:41:17 +00:00 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
UristMcAstronautandGitHub
|
b6bbe1738e
|
Add files via upload
|
2020-04-14 16:57:34 +00:00 |
|
|
UristMcAstronautandGitHub
|
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 |
|
|
kevinz000andGitHub
|
80de717dc8
|
Merge pull request #11824 from Ghommie/Ghommie-cit673
Fixes occasional tunnel hole in the space hermit ruin.
|
2020-04-12 17:02:52 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
Ghommie
|
ab3ed7f9c2
|
Space Hermit Ruin fixes.
|
2020-04-11 23:27:19 +02:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
Putnam3145andGitHub
|
295a4e0238
|
ass-covering (#11788)
|
2020-04-09 16:19:57 +02: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 |
|
|
kevinz000andGitHub
|
ffa7f198a0
|
Merge pull request #11752 from EmeraldSundisk/cogfix1
Some door fixes for CogStation.
|
2020-04-09 02:37:55 -07: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 |
|
|
TrilbySpaceClone
|
cb187dd944
|
corrections?
|
2020-04-07 07:36:20 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
a6e07e5427
|
Merge branch 'master' into found_and_hidden
|
2020-04-07 03:37:09 -04:00 |
|
|
EmeraldSundisk
|
f78903a2e6
|
Update job_changes.dm
|
2020-04-06 20:32:19 -07:00 |
|
|
EmeraldSundisk
|
3953e64d5b
|
Revert "4/6"
This reverts commit 0139a2543d.
|
2020-04-06 18:39:57 -07:00 |
|
|
EmeraldSundiskandGitHub
|
0139a2543d
|
4/6
|
2020-04-06 16:07:21 -07:00 |
|
|
TrilbyspacecloneandGitHub
|
ee1cb5f8c5
|
yay fixes (#11756)
|
2020-04-06 17:51:07 +02:00 |
|
|
Kraseo
|
df277721d7
|
public mining is gone crab crab crab
|
2020-04-06 16:21:06 +02:00 |
|
|
EmeraldSundisk
|
8b46cb2866
|
Create job_changes.dm
|
2020-04-05 09:13:10 -07:00 |
|
|
nik707andGitHub
|
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 |
|
|
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 |
|
|
raspyosuandGitHub
|
f735a2319a
|
it (#11721)
yeah
|
2020-04-04 00:47:18 +02:00 |
|
|
EmeraldSundiskandGitHub
|
baa320d16f
|
Add files via upload
|
2020-04-03 12:38:26 -07:00 |
|
|
Ghommie
|
45d1917f0f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-02 16:07:13 +02:00 |
|