Chinsky
b55097cf6d
Merge pull request #8934 from PsiOmegaDelta/Air
...
Fixes #8931 .
2015-04-23 09:20:19 +03:00
PsiOmega
6966e429d9
Merge remote-tracking branch 'upstream/dev' into DisposalMassDrive
2015-04-22 17:44:08 +02:00
Ravensdale
4964f5ce9a
Make AI core a little more engineer resistant
...
Fix turret layout to minimize friendly fire
fix fix foyer things
mrr
2015-04-22 07:17:36 -07:00
PsiOmega
115d28e6dc
Disposals Refresh
...
Began with removing a couple of random power cables under grills on the asteroid.
Then added a blast door to go with the disposal mass driver, to prevent trash from floating out into space before ejection, while giving the place a bit of character.
2015-04-22 13:15:05 +02:00
PsiOmega
1b83666e28
Fixes #8931 .
...
Standardizes external airlock access.
2015-04-21 18:10:31 +02:00
RavingManiac
28155cf9bd
Toxins lab reworked to include heat exchangers, gas filters/mixers and waste gas disposal pump
...
Changelog updated accordingly
2015-04-21 21:01:46 +10:00
PsiOmega
f6d0ab1578
Shower curtains no longer lose their default color upon being washed.
...
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
PsiOmega
3810bef4bf
Merge remote-tracking branch 'upstream/master' into dev
2015-04-20 08:39:56 +02:00
PsiOmega
16b9f39180
Fixes #8906 .
...
Medical airlock access now only expects
2015-04-19 10:44:57 +02:00
Chinsky
3819fe8d03
Merge pull request #8747 from Kelenius/ofJarsAndLizards
...
The return of the jars
2015-04-18 17:01:08 +03:00
PsiOmega
ad92c80045
Fixes #8826 .
...
Fewer walls in the captain's office.
2015-04-18 12:30:01 +02:00
Kelenius
ec1b6f122c
Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards
...
Conflicts:
icons/obj/items.dmi
maps/exodus-1.dmm
2015-04-16 19:17:10 +03:00
PsiOmega
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +02:00
PsiOmega
0466a1f47a
Camera network refactor - Part 3
...
Swept through every single Z-level, re-named/networked every single camera.
Fixes the AI Jump-To-Network verb not properly updating the network (used by the Show-Camera-List verb).
Also removes redundant Cancel option in the Show-Camera-List.
2015-04-14 11:41:01 +02:00
GinjaNinja32
d4eb42b38b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/projectiles/targeting.dm
2015-04-13 12:49:07 +01:00
PsiOmega
c616b67621
Map fixes.
...
Fixes #8441 .
Fixes #8820 .
Less stacked pipes.
Medbay now powers all its shutters.
Fixes duplicate req_access definitions.
2015-04-13 08:44:13 +02:00
PsiOmegaDelta
f988545ed5
Merge pull request #8827 from comma/dev-freeze
...
Some fixes
2015-04-13 08:17:53 +02:00
Chinsky
c3d91fbb37
Fixes #8818
2015-04-13 07:21:54 +03:00
Chinsky
2dea2424cb
Merge pull request #8811 from Zuhayr/dev
...
Adds construction drones.
2015-04-12 18:21:34 +03:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
Zuhayr
a029f88cfc
Added construction drone variant, updated the construction area map slightly.
2015-04-11 19:20:13 +09:30
PsiOmega
2836dcf648
Merge remote-tracking branch 'upstream/dev' into Engineering
2015-04-10 16:06:42 +02:00
PsiOmega
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
PsiOmega
ea528d04ea
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-10 15:21:57 +02:00
PsiOmega
24fe95933e
Area/Camera network refactor - Part 3
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Engineering/Outpost/Solars updated this run.
Also includes:
Fixes #8727 .
2015-04-10 15:17:05 +02:00
Chinsky
05da117d10
Merge pull request #8778 from PsiOmegaDelta/CivilianWest
...
Area/Camera network refactor - Part 2
2015-04-10 12:28:33 +03:00
GinjaNinja32
eebe4fc17f
Labels all pumps and pressure regulators within Atmospherics
...
Fixes #7699
2015-04-09 17:26:05 +01:00
Chinsky
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
PsiOmega
f290ea80c4
Fixes #8780 .
2015-04-08 18:24:52 +02:00
PsiOmega
b52e3168c2
Area/Camera network refactor - Part 2
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Civilian West (vacant office, cargo, primary tool storage, etc., main hallways excluded) updated this run.
Also includes:
All staff offices, including QM's, now have a privacy mode and door buttons.
2015-04-08 13:20:22 +02:00
Chinsky
175fdf57e6
Merge pull request #8703 from PsiOmegaDelta/Map
...
Area/Camera network refactor - Part 1
2015-04-07 21:41:06 +03:00
Yoshax
8893cb89d8
Actually maps the relay in (oops)
2015-04-06 20:32:35 +01:00
PsiOmega
372a08b32b
Merge remote-tracking branch 'upstream/dev' into NewThermals
2015-04-05 23:03:54 +02:00
Zuhayr
5375ade247
Merge pull request #8757 from GinjaNinja32/skipjack
...
Skipjack mapping fixes
2015-04-06 02:50:37 +09:30
PsiOmega
75757a48f6
Merge remote-tracking branch 'upstream/dev' into Map
2015-04-05 09:55:41 +02:00
PsiOmega
d3a1ddfa09
Thermal/NVG changes.
...
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
2015-04-05 09:54:55 +02:00
Chinsky
c86706f0d3
Merge pull request #8699 from mwerezak/docking-update
...
Adds docking support for multishuttles
2015-04-05 09:49:59 +03:00
Raptor1628
cf74e22870
Hardsuit Stuff
...
Icons for all modules and control modules, two new suits, some modified
stats. Station suits are now split, with their spawned "equipped"
version having modules and access requirements, and their parent type
having neither.
2015-04-04 17:59:10 -04:00
mwerezak
2217407dca
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into docking-update
2015-04-03 15:14:44 -04:00
PsiOmega
8e55ad8114
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
GinjaNinja32
89d8816411
Skipjack mapping fixes
...
Changes skipjack walls to simulated shuttle walls with altered icon/icon_state
Changes unsimulated floor in right storage/entrance area to simulated shuttle plating
Changes nitrogen airlock pressure tanks to air ones
2015-04-02 07:04:18 +01:00
mwerezak
fbd1ddade4
Adds refresh button, fixes arrivals docking frequency.
2015-04-02 00:26:45 -04:00
PsiOmega
e6cd517f47
Area/Camera network cleanup - Part 1
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Security updated first.
The AI jump-to-network command now offers a sorted list as well as quick selection (using the chat bar).
2015-04-01 13:12:36 +02:00
mwerezak
6ef4be5ac1
Fixes leftover req_access_txt
2015-04-01 01:14:56 -04:00
mwerezak
7366df388b
Merge remote-tracking branch 'upstream/dev' into docking-update
2015-03-31 20:50:02 -04:00
Kelenius
41ff9819bd
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
Kelenius
4a21810b9d
Finalizes jars
...
Adds sprites (by Ryoku)
Places one in bartender's backroom, one in kitchen, two in xenobio
Adds autolathe recipe for them
2015-03-31 17:27:46 +03:00
mwerezak
a7a032195a
Adds fixovein to the merc operating theater, merc vendor now vends sunglasses.
2015-03-31 02:41:59 -04:00
Mark9013100
4bed7f1f7f
and some map fixes
2015-03-30 23:51:38 -04:00
Mark9013100
47b95c8d2e
Fixes broken paper formatting
2015-03-30 21:34:12 -04:00
