Commit Graph

540 Commits

Author SHA1 Message Date
ccomp5950
6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
Hubblenaut
3127ee28b5 Fixes subcategories of floor tiles not being placable 2015-12-11 11:08:36 +01:00
Zuhayr
c4c63b5d19 Forensics fixes/tweaks. 2015-12-10 19:34:28 +10:30
PsiOmegaDelta
185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
2015-12-08 08:09:37 +01:00
Jon
c9b7a8ece3 Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.

Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-06 14:01:21 -05:00
mwerezak
87648e86ef Fixes runtime when cleaning turfs with soap
Partial fix of #11490
2015-12-06 02:00:50 -05:00
Zuhayr
14c39c6ba4 Merge pull request #11559 from PsiOmegaDelta/151202-InfraredFix
Fixes proximity sensors being passed turfs/areas
2015-12-04 04:16:31 +10:30
Zuhayr
63c4da0f9f Fixes reset decals not destroying themselves. 2015-12-02 18:17:26 +10:30
Zuhayr
a90c2ca077 Runtime fixes.
(cherry picked from commit 0cf0b726608ca07ae456441355b399095f21dffc)
2015-12-02 08:37:09 +01:00
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
88d85c16fa Scheduler now uses btime.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1540.
2015-10-24 12:53:04 +02:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
Kelenius
83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
PsiOmega
fa6319d52d Turf initialization tweaking.
Removes the need for a spawn() in New().
2015-09-27 13:18:18 +02: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
Chinsky
36e61e45bf Merge pull request #11173 from PsiOmegaDelta/150922-AutoDirt
Random maintenance debris, junk and dust.
2015-09-24 15:29:19 +03:00
PsiOmegaDelta
b3b657ee37 Random maintenance dirt.
The state of maintenance is now randomly generated.
This includes patches of oil, trash, spiderwebs, dirt, and so forth.

Utilizes a system which makes it possible to apply custom turf initializers per area.
2015-09-22 14:53:04 +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
PsiOmegaDelta
bd3b4c5d81 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-19 21:37:05 +02:00
PsiOmegaDelta
2d01a06f00 Corrects world-edge math.
Meteors coming from the east would immediately be transfered to another Z-level and deleted, due to being considered outside the Z-level transition border.
2015-09-18 15:23:18 +02:00
GinjaNinja32
30782cde8f Remove the need to map in the title screen, move title screen icons into a single file 2015-09-12 08:34:28 +01:00
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
8c743329df Merge pull request #10955 from SkyMarshal/multi-z
Overhauls Multi-Z
2015-09-05 11:36:59 +09:30
Chinsky
8590ebe13a Merge pull request #10933 from caelaislinn/b12_bugfix
resolves issue with space and unsimulated turfs being odd and dark
2015-09-03 01:06:08 +03:00
Joseph Heinemeyer
8c61c3ab6f Fixes multi-z things. 2015-08-30 18:58:37 -07:00
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
Cael Aislinn
d41083cfae resolves issue with space and unsimulated turfs being odd and dark
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-30 15:27:04 +10: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
Zuhayr
b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03: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
45c7934219 Floor instance cleanup. 2015-08-18 13:58:32 -07:00
Zuhayr
e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00
Zuhayr
ea56f3caa6 Minor cleanup of proxmove, changeturf, oldcode floors. 2015-08-18 12:13:52 -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
Zuhayr
3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
Zuhayr
c72a746f20 Compile fixes. 2015-08-16 06:29:04 -07:00
Zuhayr
932f87faa5 Semi-fixes turf layering issues with pipes and newflooring. 2015-08-16 06:09:36 -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