Commit Graph

674 Commits

Author SHA1 Message Date
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Mark9013100
41de641287 Adds blue carpet stack 2016-05-27 22:34:35 -04:00
Yoshax
f778f29b9d Finishes snowy stuff, adds overlays etc 2016-05-28 01:45:03 +01:00
Yoshax
da9d1eb786 Fixes snow and adjusts a definition 2016-05-27 17:13:01 +01:00
Yoshax
61deea28a8 Ensures walls spawn 2 pieces of metal when deconstructed 2016-05-27 00:25:01 +01:00
Yoshax
5958a4a585 Removes tags from blue carpet 2016-05-15 13:57:47 +01:00
Yoshax
6b6fb4a6ca Makes blue carpet and AI floor removable 2016-05-12 14:54:40 +01:00
Hubblenaut
e41ad0c946 Reinforced Walls
Lowers amount needed for building a reinforced wall from a girder from
four to two sheets.
Gets rid of rod products from dismantling a reinforced wall.
Adds one more extra step for undoing the deconstruction.
2016-04-15 16:41:33 +02:00
Yoshax
0c5eb32fef Adjusts reinforced wall construction 2016-04-04 18:39:02 +01:00
Mark9013100
994388e138 Fixes floor decal layering 2016-03-09 01:45:47 -05:00
Neerti
6224e978a9 Merge pull request #1014 from Zuhayr/voxremove
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Yoshax
46f2528481 Adds linoleum stack 2016-02-20 04:10:41 +00:00
Yoshax
05271723eb Fixes #890 2016-02-20 03:13:20 +00:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Neerti
2daac2d647 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks
# Conflicts resolved:
#	code/modules/mob/living/carbon/human/human_defense.dm
2016-02-06 01:55:02 -05:00
Neerti
2b86af1350 EMP tweaks/fixes
For borgs, EMP no longer results in a stun.  Instead, they are confused, and their HUD becomes static-y for a moment.  Their module items are also forced back into the borg, effectively disarming them.
EMP now drains powercells from current charge instead of max_charge, so two blasts should not empty the cell, for borgs.
Fixed bug where EMP was being applied twice to human mobs, including FBPs, resulting in them literally dying in one hit.
Synthetic organs take much less damage from EMP.
Synthetic external organs also take less damage, but more than their organs.
Bonus: Runtime fix for spawning in as a borg.
2016-02-04 09:51:25 -05:00
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kelenius
9f7b65faf8 Optimizes asteroid generation 2016-01-21 11:42:18 +03:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
40b7c087c9 Attempting to fix perma-wet-floors bugs. 2016-01-12 15:50:20 +10:30
PsiOmegaDelta
949d3d0c7f Merge pull request #11770 from Baystation12/master
Dev-feeeze
2015-12-28 16:32:46 +01:00
ccomp5950
8614484408 Hidden doors when open can be seen through.
Fixes #11765
2015-12-27 19:17:21 -05:00
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
Hubblenaut
5baf93722a Fixes subcategories of floor tiles not being placable 2015-12-10 16:28:40 +01:00
Zuhayr
4376948bdf Forensics fixes/tweaks. 2015-12-10 19:20:09 +10:30
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
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
mwerezak
87648e86ef Fixes runtime when cleaning turfs with soap
Partial fix of #11490
2015-12-06 02:00:50 -05:00
Jon
85c704676f 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.
2015-12-05 04:24:17 +00:00
Zuhayr
16c039aadc Fixes reset decals not destroying themselves. 2015-12-02 19:55:07 +10:30
Zuhayr
1a0eecd09a Runtime fixes. 2015-12-01 18:07:50 -05:00
Datraen
716401fffc Allows people to see through fake walls when opened, removes that when closed. 2015-11-30 17:41:15 -05:00
Datraen
60764d014f Makes fake-walls not air tight once opened. Fake walls continue to not be air tight after being closed. 2015-11-30 17:14:29 -05:00
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
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
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
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