CorruptComputer
91c63cd602
Merge branch 'master' of https://github.com/tgstation/-tg-station into MergeConflictsSuck
2015-06-16 09:35:30 -05:00
WJohn
88a053a6c0
Merge pull request #9852 from pudl/salem
...
MiniStation Aesthetic Overhaul
2015-06-15 09:46:38 -04:00
CorruptComputer
e1524f11cd
Merge branch 'master' of https://github.com/tgstation/-tg-station into MergeConflictsSuck
2015-06-13 12:29:08 -05:00
pudl
1329d5acb5
several minor fixes, mostly icon state and turf related
2015-06-08 19:21:57 -05:00
pudl
817341cd09
updates the ministation map to a much nicer aesthetic
2015-06-08 18:58:55 -05:00
Aranclanos
a07024d469
Fixes the area of the security pod
2015-06-08 05:29:41 -03:00
Cheridan
389007d85d
Merge pull request #9822 from kyrahabattoir/Ministation-stuff-part3
...
[Ministation] Cleaned up all the remaining vents & scrubbers that use…
2015-06-07 21:37:20 -05:00
Cheridan
66c7ea6635
Merge pull request #9675 from Jordie0608/equalrightsforcrewinaimodules
...
Resolves #4400 , moves protectstation module on meta
2015-06-07 16:52:53 -05:00
KyrahAbattoir
c8195b5181
[Ministation] Cleaned up all the remaining vents & scrubbers that used invalid icon states, rebuilt the engine pipework so that they use the right pipe types, rebuilt toxins research burn chamber piping.
2015-06-07 00:44:38 +02:00
Cheridan
f874d23516
Merge pull request #9781 from kyrahabattoir/Ministation-glass-part2
...
[MiniStation] Bunchafix edition volume 1
2015-06-06 13:03:04 -05:00
Jordie0608
522b6e1ae5
moves protectstation module to highrisk table
2015-06-06 16:41:39 +10:00
CorruptComputer
c04b160e7a
Changed Solars around so that they actually work
...
Pickaxes to EVA
Changed AI room around
2015-06-05 11:56:23 -05:00
Cheridan
12503d403a
Merge pull request #9785 from CorruptComputer/BoxFixes
...
BoxStation Fixes
2015-06-05 10:11:55 -05:00
KyrahAbattoir
7c22b7a0b6
replaced rglass in bar hydroponics cargo waiting line & common room (interiors) by normal glass.
...
fixed electrification of bridge windows.
fixed bridge blast shutter iconstates.
reordered wires on security's electrified glass for clarity
replaced glass in sec, command, waste, cargo, detective
replaced rglass in common areas by regular glass.
cleaned up vars on vents & scrubbers in arrival/escape,dorm
rooms,cargo,sec,command,detective, custodial closet, eva,bar.
turned on the waste air injector & replaced connector ports in the atmo maint by "visible" ones.
reattached the cell timer panels to their respective walls.
replaced locker for cell "3" by cell "2"
2015-06-05 09:49:02 +02:00
CorruptComputer
6845b69e59
Ok lets try this again
2015-06-04 22:43:32 -05:00
CorruptComputer
f830fed66b
Turbine Door
2015-06-04 15:44:22 -05:00
CorruptComputer
e1b18633d1
Fixed the stacked heater+freezer
2015-06-04 14:37:11 -05:00
CorruptComputer
e3d075eac3
Moved camera console over 1 tile
2015-06-04 12:40:15 -05:00
CorruptComputer
736fd1b19c
Fixed pipe
2015-06-04 12:00:46 -05:00
CorruptComputer
38ea7a4269
Fixes
2015-06-04 09:55:56 -05:00
Cheridan
5679d7fa52
Merge pull request #9684 from Xhuis/aiUploadFix
...
Fixes the AI upload having no cameras
2015-06-03 23:38:55 -05:00
KyrahAbattoir
37fe5e666a
Conversion to whole tile glass part 1: engineering,comms,arrival
2015-06-03 03:42:47 +02:00
KyrahAbattoir
1b8a9af8de
Ministation z2 and z4 updated for "unsimulated is kill"
2015-06-03 01:43:06 +02:00
Cheridan
662abd849c
Merge pull request #9755 from kyrahabattoir/ministation-tcom-fix
...
Ministation: fixed tcoms
2015-06-02 16:06:40 -05:00
Cheridan
bcdf74670f
DAMAGE CONTROOOOOOOOOL
2015-06-02 15:43:39 -05:00
KyrahAbattoir
e9cce952ea
Ministation: fixed tcoms
2015-06-02 21:37:33 +02:00
Aranclanos
dea72572c1
Created a new path of turfs, /turf/indestructible, they are only walls, turfs that are non interactive and static, like the splash screen or the borders of the different spawn spots of centcomm Z level (like wizard or nuke ops)
...
Fixes a few dirs of turfs in centcomm
2015-06-02 14:38:55 -03:00
Aranclanos
e7c0d7e95c
Removes unsimulated turfs.
...
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Xhuis
062101e0f0
Fixes the AI upload having no cameras
2015-05-28 17:18:23 -04:00
Cheridan
909fcdc9a5
Merge pull request #9681 from kyrahabattoir/ministation-fixes
...
Removed duplicate pipes
2015-05-28 15:03:24 -05:00
KyrahAbattoir
10bd7c8e73
Removed duplicate pipes
2015-05-28 20:49:15 +02:00
duncathan
8c734b2ed5
fixes file paths on meta and mini
2015-05-27 19:57:22 -06:00
duncathan
f4f5ccae61
cleanup of various unused/useless things
...
removed unused pipe vars alert_pressure, fatique_pressure, maximum_pressure
moved pipe vars maximum_temperature_difference, thermal_conductivity to h/e pipes
removed insulated pipes, as they are identical to simple pipes in every way
removed insulated pipes from RPD.dm, pipe_dispenser.dm and construction.dm
removed red_pipe.dmi
changed instances of insulated pipes on box (whyyyy) to simple pipes
2015-05-27 18:12:12 -06:00
Cheridan
1159c971de
Merge pull request #9650 from Incoming5643/Iknewitwasbigger
...
Fixes Metastations's lower sign
2015-05-26 15:06:09 -05:00
Jordie0608
a78f74ed79
mergefix i hope
2015-05-26 16:10:23 +10:00
Incoming
cc558db1e5
Fixes Metastations's lower sign, which I didn't know existed (I don't play on Meta, okay?)
...
Also fixes Ministation's sign, because it's still technically supported
2015-05-25 18:30:39 -04:00
Xhuis
215756f6b1
Fixes toxin airlocks not blocking heat
2015-05-25 13:31:50 -04:00
Xhuis
808eb8e52d
Adds the PACKETS!! plaque
2015-05-25 11:49:39 -04:00
Xhuis
ec8459a7d4
Fixes the AI upload being exposed to space
2015-05-25 11:31:41 -04:00
Cheridan
17dffe05a9
Merge pull request #9575 from Incoming5643/at_last_the_world_is_at_peace
...
Realigns the Space Station 13 logo
2015-05-24 22:56:23 -05:00
Jordie0608
028308c5ca
re-adds shuttle areas for teleporting to
2015-05-22 17:40:20 +10:00
phil235
81948d5f8c
Merge pull request #9505 from Firecage/rainbowjumpsuit
...
This fixes the issue of colored jumpsuits not being dyeable into rainbow jumpsuits.
2015-05-21 16:20:38 +02:00
Incoming
f50963ba71
Realigns the Space Station 13 logo to actually be centered on modern station
2015-05-20 13:45:27 -04:00
Cheridan
7a14c14fc5
Merge pull request #9504 from Aranclanos/airlockController
...
Airlock controller revamp
2015-05-20 09:02:10 -05:00
Cheridan
d0115cbd58
Merge pull request #9522 from xxalpha/derelictdrones
...
Added three drone shells to the derelict.
2015-05-20 08:16:58 -05:00
Aranclanos
73d7c600c2
Updates metastation with the airlock controller path changes from my previous commit.
2015-05-19 10:19:34 -03:00
Boggart
d67a9f12a6
Fixes the telecomms SMES wiring and removes a stacked pipe between science and medical.
2015-05-18 17:00:43 -06:00
Cheridan
dbb2999c85
Merge pull request #9536 from xxalpha/departmental_oppression
...
Fixed departmentental security spawning.
2015-05-18 08:37:52 -05:00
xxalpha
d590e94011
Added department security spawn points to Metastation.
...
Fucking meta what is going on
Added department security spawn points to Box.
Added department security spawn points to Metastation.
2015-05-17 13:38:01 +01:00
xxalpha
62426279b4
Added department security spawn points and fixed dep sec spawning.
2015-05-16 22:20:31 +01:00
