Commit Graph

12695 Commits

Author SHA1 Message Date
Zuhayr
d1d28b3da5 Merge pull request #11201 from PsiOmegaDelta/150927-TurfInit
Turf initialization tweaking.
2015-09-27 22:19:08 +09:30
PsiOmega
63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
PsiOmega
fa6319d52d Turf initialization tweaking.
Removes the need for a spawn() in New().
2015-09-27 13:18:18 +02:00
Chinsky
c3d6fd07fd Merge pull request #11199 from mwerezak/paper-gender
Fixes #11196
2015-09-27 13:02:59 +03:00
HarpyEagle
380b89fcc0 Fixes #11130, renames aghosted var
because it is no longer used solely for aghosting.
2015-09-26 20:48:13 -05:00
HarpyEagle
592c824837 Changes paper and paper bundle gender, plus rename 2015-09-26 20:27:57 -05:00
mwerezak
03cb79a85d Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
Destroy tweaks.
2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity
Makes more sources of radiation respect rad-protection.
2015-09-26 20:10:47 -05:00
SkyMarshal
144dbebb2d Multi-z fixes. 2015-09-26 17:39:16 -07:00
PsiOmega
a3b9ab1236 Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection. 2015-09-26 09:19:58 +02:00
PsiOmega
709840f848 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/DB ban/functions.dm
2015-09-26 08:48:37 +02:00
PsiOmega
145d8d91ef Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
PsiOmegaDelta
11a03abbf7 Makes more external sources of radiation respect rad-protection.
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
2015-09-25 15:02:20 +02:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
PsiOmegaDelta
509486dbd9 Merge pull request #11181 from GinjaNinja32/crash_with
Add proc/crash_with, fix two incorrect qdel calls
2015-09-25 06:31:38 +02:00
Hubblenaut
8d3519e24b Belt layer below suit layer, belts toggleable 2015-09-24 17:48:14 +02:00
GinjaNinja32
8ed4faf7b2 Add proc/crash_with, fix two incorrect qdel calls 2015-09-23 13:29:54 +01:00
GinjaNinja32
9be47c6374 Permabans do not expire, and we don't need to show expired when it's been manually lifted 2015-09-23 13:03:11 +01:00
GinjaNinja32
c707519d1f Add specific color for expired bans in ban panel, fix some formatting and a runtime 2015-09-23 12:58:39 +01:00
Zuhayr
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable
Species tweaks
2015-09-21 19:08:53 +09:30
Chinsky
02661be540 Merge pull request #11136 from PsiOmegaDelta/150918-BiasedMeteors
Meteor events are now direction biased.
2015-09-21 11:54:10 +03:00
SkyMarshal
8b225e4ba6 Update to stairs. 2015-09-20 18:25:23 -07:00
PsiOmegaDelta
d891fba1cc Mob size tweaks.
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
PsiOmegaDelta
292c1545cb Species datums now include pass flags.
Utilized to allow Pun-Pun and other monkeys to once again climb tables.
2015-09-20 16:13:20 +02:00
Chinsky
6103f688cf Merge pull request #11143 from PsiOmegaDelta/150919-GlowyThings
More glowy stuff.
2015-09-20 04:51:01 +03:00
Chinsky
842f11a087 Merge pull request #11129 from PsiOmegaDelta/150917-LanguageReset
Adds language prefix reset option.
2015-09-20 04:45:13 +03:00
PsiOmegaDelta
bd3b4c5d81 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-19 21:37:05 +02:00
PsiOmegaDelta
de9e68cdcd Merge pull request #11151 from Baystation12/master
Dev-freeze
2015-09-19 21:25:15 +02:00
PsiOmegaDelta
59c5807157 Active stunbatons now glow. 2015-09-19 21:12:19 +02:00
PsiOmegaDelta
59f7b889d4 Constant fix. 2015-09-19 20:54:43 +02:00
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
d65ebf8b90 Meteor events are now direction biased.
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
2015-09-18 21:45:15 +02:00
PsiOmegaDelta
8421058ece Adds language prefix reset option.
Allows you to reset the language prefix key to the server defaults. Mostly a convenience thing.
Adds missing reserved say character.
2015-09-18 21:42:02 +02:00
GinjaNinja32
780db3314d Merge pull request #11128 from PsiOmegaDelta/150917-BumpyRide
Fixes Pun-Pun (and other small mobs) pushing people around.
2015-09-18 08:20:35 +01: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
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
f65649c8ba Fixes Pun-Pun (and other monkeys) pushing people around.
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
2015-09-17 09:40:19 +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
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
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