Commit Graph

20766 Commits

Author SHA1 Message Date
PsiOmegaDelta
fa6799ec3a APCs now produce a glow.
APCs now produce a glow, with similar range and strength as fire and air alarms.
2015-09-19 10:12:02 +02:00
PsiOmegaDelta
232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-09-18 08:51:10 +02:00
PsiOmegaDelta
9946c837e4 Merge pull request #11134 from Baystation12/master
Dev-freeze
2015-09-18 08:50:11 +02:00
Zuhayr
1d7150ecd6 Merge pull request #11127 from PsiOmegaDelta/150917-MassiveNumberofMeteors
Meteors no longer impact with each other.
2015-09-18 14:34:14 +09:30
Chinsky
7a2183e97e Merge pull request #11107 from Kelenius/reishiJitter
Fixes  #10925
2015-09-18 06:08:44 +03:00
PsiOmegaDelta
dcc4655026 Merge pull request #11112 from caelaislinn/missing_spawn
QOL feature for mappers
2015-09-17 21:11:52 +02:00
PsiOmegaDelta
0e4f51413b Merge pull request #11074 from GinjaNinja32/title
Title screen update
2015-09-17 21:11:31 +02:00
PsiOmegaDelta
eb2151c118 Meteors no longer impact with each other.
This increases the number of meteors which survive to reach the station, as there is some tendency for them to spawn on the same location (but not necessarily fly in the same direction).
2015-09-17 09:08:09 +02:00
GinjaNinja32
a7ed0ff2fb Merge pull request #11124 from PsiOmegaDelta/150916-LawChanneling
Makes the additional law channel handling more flexible.
2015-09-17 06:27:41 +01:00
Chinsky
412380c3ab Merge pull request #11110 from GinjaNinja32/cleaning
fix #11061
2015-09-17 05:43:11 +03:00
Chinsky
5d1b1cd123 Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice
Prevents observer mice from spawning on the admin Z-level.
2015-09-17 05:42:15 +03:00
Chinsky
5383bc129b Merge pull request #11120 from PsiOmegaDelta/150916-DefineMe
Macro refactoring.
2015-09-17 05:39:14 +03:00
Chinsky
7e9c84c0f6 Merge pull request #11122 from PsiOmegaDelta/150915-PowernetDestroy
Improves powernet destruction.
2015-09-17 05:38:38 +03:00
PsiOmegaDelta
48ce35a179 Makes the additional law channel handling more flexible.
It has no particular purpose at this time, except to be a general improvement.
2015-09-16 16:36:04 +02:00
GinjaNinja32
73078a19ce Merge pull request #11091 from mwerezak/lighting-fix
Fixes #10710
2015-09-16 14:59:39 +01:00
Dennok
536a3a6070 fix #10882 2015-09-16 14:34:20 +03:00
PsiOmegaDelta
7ce27f76fd Macro refactoring.
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +02:00
GinjaNinja32
24ba93c3fa Merge pull request #11108 from FalseIncarnate/master
Invisible / Missing Growth State Fix
2015-09-16 09:48:32 +01:00
PsiOmegaDelta
f8a38ec7cf Improves powernet destruction.
While we currently do hard del datums this is a step towards a better world.
2015-09-16 08:00:22 +02:00
Cael Aislinn
00c9402656 enables spawning at latejoin landmarks instead of space if unable to find appropriate job spawn landmark
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-09-16 12:48:37 +10:00
PsiOmega
e731127b1c Corrects HTML tag mismatch. 2015-09-15 20:39:33 +02:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
GinjaNinja32
6a61269edd Merge pull request #11106 from Kelenius/jetpackFixes
Fixes for jetpacks and gas tanks
2015-09-15 15:06:58 +01:00
GinjaNinja32
52b51a6be4 fix #11061 2015-09-15 13:24:11 +01:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
FalseIncarnate
4a9dc8dc8f Invisible / Missing Growth State Fix
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
2015-09-14 17:35:33 -04:00
mwerezak
db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
Kelenius
eef1013db2 Fixes #10925
Makes psilocybin less robust, also cuts down emote spam
2015-09-14 16:54:24 +03:00
Kelenius
3c4369823f Fixes for jetpacks
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
2015-09-14 16:35:52 +03:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove()
Fixes #11102.
2015-09-14 11:13:15 +02:00
Kelenius
9dd6f9762a Resolves #11049 2015-09-14 12:05:28 +03:00
PsiOmegaDelta
b79f061877 Merge pull request #11103 from GinjaNinja32/pills
fix pill attack_log entry, switch to using key_name
2015-09-14 07:31:07 +02:00
GinjaNinja32
e29f5d108c fix pill attack_log entry, switch to using key_name 2015-09-14 06:24:49 +01:00
PsiOmega
98175214d6 Attempts to improve mob in view acquirement.
Creates a central proc that can (and will be) re-used.
This proc is hopefully more expandable by utilizing proc overrides.
It is now 1 instead of 3 loops (made even worse by the fact that each individual loop would re-acquire targets in view).
2015-09-13 14:32:49 +02:00
PsiOmega
a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +02:00
mwerezak
26d0a35699 Merge pull request #11085 from PsiOmegaDelta/150912-ForceMarch
Fixes #10988.
2015-09-12 23:29:03 -04:00
GinjaNinja32
5721e55f72 Merge pull request #11078 from PsiOmegaDelta/150912-StateYourLaws
Ensures the AI should always be able to state ion laws.
2015-09-13 02:23:27 +01:00
mwerezak
810ca147d0 Fixes #10710 2015-09-12 19:34:43 -04:00
PsiOmega
0c21ef741e Fixes #10988.
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926.
2015-09-12 20:43:24 +02:00
PsiOmega
81861f4dd6 Ensures the AI should always be able to state ion laws.
Switched the first character selection to a number to avoid collision with custom language keys on dev.
2015-09-12 15:02:42 +02:00
PsiOmega
8d57b2d0a0 Fixes observers being unable to see silicon antag status.
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.

It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
2015-09-12 14:39:10 +02:00
PsiOmegaDelta
26f533bb01 Merge pull request #11076 from PsiOmegaDelta/dev
Dev
2015-09-12 13:17:47 +02:00
PsiOmega
e722da01f6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-09-12 13:10:29 +02:00
PsiOmega
834d93df00 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-12 12:51:22 +02:00
GinjaNinja32
c014866ac9 Remove unneccessary /area/start definition 2015-09-12 08:46:50 +01: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
Chinsky
adf19d674b Merge pull request #11055 from mwerezak/coffee-fix
Returns coffee jitteriness to an overdose effect
2015-09-11 22:49:35 +02:00