GinjaNinja32
82aa88c777
Merge pull request #9862 from Zuhayr/dev
...
Fixes
2015-06-20 17:27:26 +01:00
Zuhayr
6f00d831e5
Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
...
Base proc: emag_act
2015-06-21 01:18:25 +09:30
Zuhayr
1e56cc0914
Fixes #9836
2015-06-20 21:43:54 +09:30
PsiOmegaDelta
22d0f6ab83
Compilation fixes.
2015-06-19 10:25:43 +02:00
PsiOmegaDelta
1558bd5b75
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
GinjaNinja32
078cfb2533
Merge pull request #9774 from mwerezak/chem-touch
...
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
mwerezak
73333ac9c8
Moves metabolism to a holder subtype
2015-06-16 16:26:06 -04:00
mwerezak
70433b4367
Makes showers wash away touching reagents
...
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
PsiOmegaDelta
5ac575f579
Yet another span fix.
2015-06-16 11:09:36 +02:00
PsiOmegaDelta
307f36e919
Compilation fixes.
2015-06-16 11:03:25 +02:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmegaDelta
37f59551fc
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/PDA/PDA.dm
code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
PsiOmegaDelta
93c3d03801
Merge pull request #9817 from GinjaNinja32/records
...
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
0423691ca2
Missed a span
2015-06-15 12:20:16 +01:00
GinjaNinja32
4da75dba68
Fixes some more unbalanced HTML
2015-06-15 10:48:30 +01:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
GinjaNinja32
3c525e907a
'Fixes' NanoUI locking up on medical/security records
2015-06-14 14:44:38 +01:00
mwerezak
ad24805eb8
Mob fire temperature fix, tweaks
...
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.
Also made mob fires burn hotter overall and resisting slower.
2015-06-13 15:45:52 -04:00
PsiOmega
8279cc48d8
mob/living/Life() now handles mutations and radiation.
2015-06-13 19:40:24 +02:00
PsiOmega
06f2009fbf
mob/living/Life() now handles environment.
2015-06-13 14:45:13 +02:00
PsiOmega
2760836b15
mob/living/Life() now handles breathing.
2015-06-13 14:43:56 +02:00
PsiOmega
ee88e7b8b4
Base Life-addition()
2015-06-13 13:36:08 +02:00
PsiOmega
24cd59382c
Absolute Life paths.
...
Changes relative Life paths into absolute to make a potential refactoring easier to manage.
2015-06-13 11:41:37 +02:00
PsiOmega
57f0a3535c
Observers can now only follow hivespeech as long as the speaker uses its real identity or antagHUD is enabled.
2015-06-12 17:19:29 +02:00
PsiOmegaDelta
8c7cbeb093
Ghosts can now follow hivemind speech.
...
Ghosts can now follow hivemind speech with the same targets as for normal speech (separate links for mob and eye if any, etc.).
2015-06-12 15:00:53 +02:00
Zuhayr
cef958cac2
Fixes #9503
2015-06-10 23:14:33 +09:30
Zuhayr
018c3fc2aa
Fixes #9517 and #9542
2015-06-10 23:14:33 +09:30
PsiOmegaDelta
7573ef961c
Merge remote-tracking branch 'upstream/dev' into 150609-TrackEye
2015-06-10 11:16:34 +02:00
PsiOmegaDelta
75cffd60aa
Merge pull request #9780 from Baystation12/dev-freeze
...
Dev
2015-06-10 11:15:45 +02:00
PsiOmegaDelta
b44da1ee42
Admin JMP now includes a link to EYE or BDY if any.
2015-06-10 11:08:31 +02:00
PsiOmegaDelta
e7faa19ea3
Merge pull request #9779 from Baystation12/master
...
Dev-freeze.
2015-06-10 11:04:54 +02:00
PsiOmegaDelta
449c8c8d8f
Refactors the ghost_follow_link proc to not use istype checks.
2015-06-10 10:08:17 +02:00
PsiOmegaDelta
e669c1ab7c
Merge pull request #9687 from comma/dev
...
Fixes organs self-rejecting
2015-06-10 09:39:43 +02:00
PsiOmegaDelta
1efd3f9394
Merge pull request #9775 from mwerezak/mrowl
...
Fixes tajaran name generation, tweaks
2015-06-10 07:59:10 +02:00
mwerezak
58d512d1e6
Fixes tajaran name generation, tweaks
2015-06-10 00:53:24 -04:00
PsiOmega
6f70049a12
Expanded ghost following.
...
Ghosts can now follow the Eye of a speaking mob, if it has one, or the body of someone who has died.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1151 .
2015-06-09 16:36:43 +02:00
PsiOmega
3591bd5599
Travis now builds using version 508.1287
...
throw is now a keyword. Updates usages where necessary to allow compilation.
2015-06-09 15:36:27 +02:00
Zuhayr
73146a62fe
Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths
...
NanoUI sources can now be datums instead of atom/movable.
2015-06-09 20:08:02 +09:30
PsiOmegaDelta
0af1009b50
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-09 12:14:35 +02:00
PsiOmegaDelta
97f49bb982
Merge pull request #9756 from Baystation12/master
...
Dev-freeze
2015-06-09 12:12:40 +02:00
PsiOmega
13cb32fa7f
Another MayRespawn() fix.
...
Being unable to reenter your body now allows you to respawn, even if your body lives.
2015-06-08 17:39:25 +02:00
PsiOmegaDelta
20542bf84b
NanoUI sources can now be datums instead of atom/movable.
...
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
2015-06-08 17:06:06 +02:00
Chinsky
364c2dc01a
Fixes typo.
2015-06-08 14:23:26 +03:00
Chinsky
94406a6430
Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
...
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
GinjaNinja32
d6677d4389
Merge pull request #9739 from PsiOmegaDelta/150608-NoPowerNoControl
...
AI restrictions and rejuvenation.
2015-06-08 10:08:55 +01:00
PsiOmegaDelta
81ee9178bd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-08 09:57:33 +02:00
PsiOmegaDelta
5d058be2e6
Merge pull request #9741 from Baystation12/master
...
Dev-freeze
2015-06-08 09:56:24 +02:00
PsiOmegaDelta
cad9b59c25
AI restrictions and rejuvenation.
...
Ensures the AI cannot use Topics() while unpowered.
Ensures the AI is properly rejuvenated by the AI verb, as a functional AI will now never be lying down.
2015-06-08 09:10:33 +02:00
Techhead0
9f93abbaf3
Removes Beehive and Pompadours from Unathi hairstyles.
...
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
2015-06-07 12:31:55 -04:00
