Commit Graph

29 Commits

Author SHA1 Message Date
Zuhayr
16c039aadc Fixes reset decals not destroying themselves. 2015-12-02 19:55:07 +10:30
Woodrat
7128aa72db Woodrat 9.1 "Back in Action"
- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.
2015-10-16 22:57:13 -07:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
Zuhayr
d1e2257218 Merge pull request #11189 from PsiOmegaDelta/150925-BrokenFloor
Map tweaks.
2015-09-27 15:05:56 +09:30
SkyMarshal
c06c3cd245 Adds airless steel floor and blue carpet edge mapping prefabs. 2015-09-26 16:27:47 -07:00
PsiOmegaDelta
613b2486ca Map tweaks.
Fixes issues with colored floor tiles having their item state reset, appearing black IG.
Pipe fixes and state cleanup. Floor plating under doors cleanup.
2015-09-25 14:05:39 +02:00
PsiOmegaDelta
8a1b414e28 Floor painter, turf, and decal tweaks.
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
2015-09-21 15:14:13 +02:00
Atlantis
4189fc3ff6 Adds defines for atmospherics tanks values 2015-08-29 15:53:13 +02:00
Atlantis
52d9f0ebc3 Fixes various turf/atmosphere issues
- Fixes the fact atmospherics turfs started with only ~5000kPa of relevant gas in them. This was, espicially with nitrogen, insufficient to cover round usage which is in ten thousands.
- N2 tank starts at 90k kPa, O2 at 50k kPa, CO2 and Phoron tanks at 25k kPa and N2O tank at 10k kPa. This is a combination of original values and minor balancing (O2 and N2 is used in air mix so there's a lot of it, while others are less useful/limited to toxins use so they are likely not needed at such amount). These values were verified in-game and are accurate at 20C the gas mix starts on.
- Engine no longer starts hyperpressurised with nitrogen, in a way that somehow causes it to generate 80kW without anyone touching it at all, while using only 40-50kW for circulation and stuff.
- Engine reverted to 80kPa inert N2 atmosphere that's being used for months now and is on master. Unlike 5MPa nitrogen it doesn't prevent usage of different coolant type, and doesn't overpressurise the core.
2015-08-27 07:40:18 +02:00
PsiOmegaDelta
f46fcfaf52 Adds more decals. Moving turfs now includes under/overlays. 2015-08-19 10:44:42 +02:00
PsiOmegaDelta
1ce65e0aa8 Post-merge decal cleanup.
Misc decal additions and merge fixes on most Z-levels.
Crescent windows were all kinds of a mess for some reason. Replaced instances with a spawner instead.
Asteroid solars were all cramped with solid walls. Gave them more space to allow for at least some power production.

Fixes warning stripe corners on all Z-levels. To correct the following search replace can be used:
/obj/effect/floor_decal/industrial/warning/corner{dir = 8} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 5}
/obj/effect/floor_decal/industrial/warning/corner{dir = 1} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 8}
/obj/effect/floor_decal/industrial/warning/corner{dir = 5} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 1}
2015-08-18 12:33:49 +02:00
Zuhayr
e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00
Zuhayr
ac261213e9 Rewrites the floor painter. 2015-08-16 20:58:54 -07:00
Zuhayr
84c778959a Added proper gas turfs for atmos, remapped atmos turfs. 2015-08-16 18:18:04 -07:00
PsiOmegaDelta
5846de37be Fewer decal icon states, shower curtains.
Someone had added shower curtains to the map. Creates proper definitions to avoid colors being lost on cleaning.
Floor corner decals now all utilize a white base state and simply apply a color.
2015-08-16 06:09:16 -07:00
PsiOmegaDelta
c1eba26d8a Holo-decals and fixes.
Adds more holodeck decals.
Allows overlays to be glued unto unsimulated turfs.
Ensures holo-stools use an existing icon state.
2015-08-16 06:09:15 -07:00
mwerezak
de6e878411 Fixes floorbots, floor attackby flooring setting, and adjusts a few flooring names.
Made set_flooring take a flooring instance, in case calling code already
had a flooring instance it seemed wasteful to have to look up the
flooring all over again.
2015-08-16 06:09:09 -07:00
mwerezak
ed0a089fb6 Fixes turf decal overlays layering with holopads
Holopads layer at TURF_LAYER + 0.1 so there is the possibility that turf decals might layer over them. This ensures that decals layer under holopads.
2015-08-16 06:08:22 -07:00
mwerezak
15599ab6c8 Mapping - minor airlock and other details
Finishes main medical decals (adds light blue and light yellow corner
colours), adds various touch ups to mining and incinerator airlock,
science and security blast doors. Makes the science bomb test range
airless. Removes SS13 placard. Adds privacy curtains to the medical ward
and dorms.
2015-08-16 06:08:21 -07:00
Zuhayr
1fa93c270d Various small tweaks for the flooring update. 2015-08-16 06:08:19 -07:00
PsiOmega
b55be47521 Adds dusty warning stripes. 2015-08-16 06:08:10 -07:00
PsiOmega
076a456d6f Adds additional floor icons.
Adds additional grey and lime cornel decal icons.
Adds directional Space Station 13 icons.
2015-08-16 06:08:01 -07:00
PsiOmega
aa475ea23c Adds (dirty) steel tiles. 2015-08-16 06:07:59 -07:00
PsiOmega
593023443f Fixes floor decal dir and layer not being respected. 2015-08-16 06:07:58 -07:00
PsiOmega
11fe86da58 More floor decals.
Adds additional red decal icons.
Adds grey outline decal.
2015-08-16 06:07:54 -07:00
PsiOmega
ddcc06d55f Additional floor decal icons.
Adds grey, purple, and white floor decals.
Adds full red and yellow floors, both for floor and floor tile.
Makes the U-shaped warning sprites match the straight and L-shaped sprites.
2015-08-16 06:07:51 -07:00
mwerezak
ca253677ef Adds more flooring decal types 2015-08-16 06:07:45 -07:00
Zuhayr
3a64ffcb09 Changes flooring to use /decl/flooring 2015-08-16 06:07:39 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00