d1e8f670b2
qdel(reagent) adjustments.
...
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
62155433c2
Merge corrections.
...
Fixes the todo:s I claimed I'd fix at merge.
2015-08-13 10:17:03 +02:00
4674333143
Minor holder refactor.
2015-08-13 17:31:42 +09:30
ab49ac0d6d
Adds hats to dionaea.
2015-08-13 17:31:41 +09:30
2f6a1f2830
Added hats for drones.
2015-08-13 17:31:40 +09:30
b265b3285c
Cleaned up some errors, added logging for AI module use.
2015-08-13 17:15:51 +09:30
86100ee2a4
Added procs for MMIs to use rigs as piloting AIs.
2015-08-13 17:09:25 +09:30
59d0e28aff
Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead.
...
Allows AIs/pAIs in rigs to use the selected module via middle click.
2015-08-13 17:09:22 +09:30
e362e13433
Merge pull request #10605 from PsiOmegaDelta/150813-TypoFix
...
Typo fix.
2015-08-13 17:01:25 +09:30
f6df7df714
Added diona gestalt preset.
2015-08-13 16:59:37 +09:30
231eaf7e76
Added antag uplink option for hacked supply pod.
2015-08-13 16:59:18 +09:30
a8b801b377
Added supply beacon.
2015-08-13 16:59:18 +09:30
1b840a6efc
More work on pods, added personnel pod.
2015-08-13 16:59:18 +09:30
31ffc91d47
Added supply drops.
2015-08-13 16:59:17 +09:30
dd41dfa16a
Random map generator fixes, cleanup
2015-08-13 16:59:16 +09:30
e1db48e50f
Typo fix.
...
Minor typo fix: Unladed to unloaded.
2015-08-13 09:26:41 +02:00
efef67a3e4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-13 09:11:05 +02:00
1b10f78940
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
3b1b8a33c6
Merge branch 'dev' into ofSleepersAndNano
...
Conflicts:
maps/exodus-1.dmm
maps/exodus-2.dmm
maps/exodus-3.dmm
2015-08-13 09:49:34 +03:00
ccf6fa285d
Removes Flesh to Stone fully.
...
Fixes #10600 .
2015-08-13 08:25:03 +02:00
d8d94b9d64
Merge branch 'dev' into ofSleepersAndNano
...
Conflicts:
code/game/machinery/Sleeper.dm
maps/exodus-1.dmm
2015-08-13 09:20:51 +03:00
93959dc83d
Changelog + scrambled paper
2015-08-13 01:16:00 -05:00
db565ae2ff
Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery
...
Conflicts:
code/datums/datacore.dm
code/defines/obj.dm
2015-08-13 08:11:32 +02:00
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
c63f4c62b5
Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney
...
Conflicts:
code/__defines/mobs.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job_controller.dm
2015-08-13 08:06:11 +02:00
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03:00
b7964c2f4a
Missed a couple of t_ variables
2015-08-13 06:02:38 +01:00
477a9b8dba
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-13 05:55:05 +01:00
f52d48c91f
Merge remote-tracking branch 'upstream/dev' into follow
...
Conflicts:
.travis.yml
2015-08-13 05:54:30 +01:00
cde0f889c7
Merge remote-tracking branch 'upstream/dev' into gender
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
2015-08-13 05:52:51 +01:00
e96ff66715
Merge remote-tracking branch 'upstream/dev' into vv
...
Conflicts:
code/modules/admin/verbs/debug.dm
2015-08-13 05:46:16 +01:00
38f711b7c6
Merge remote-tracking branch 'upstream/dev' into jumpskirt
2015-08-13 05:39:27 +01:00
ac80136603
Merge pull request #10184 from mwerezak/projectile-cleanup
...
Projectile code cleanup
2015-08-13 07:26:58 +03:00
f7ccf47f06
Merge pull request #10030 from GinjaNinja32/languages
...
Reworks character creation language selection
2015-08-13 07:23:44 +03:00
89659c99fc
Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor
...
Refactors mask voice changes.
2015-08-13 07:23:27 +03:00
fc14ec9fca
Merge pull request #9883 from mwerezak/ert-lights
...
Adds more coloured lights
2015-08-13 07:22:45 +03:00
21f7c8234d
Merge pull request #10473 from mwerezak/firemode-cleanup
...
Streamlines gun fire modes
2015-08-13 07:22:28 +03:00
98c2a0c8b1
Merge pull request #10594 from mwerezak/embed-fix
...
Embedding and broken limb fixes
2015-08-13 04:52:20 +01:00
1dc853710c
Implant items do not count for continuing to process embedded objects
...
Also makes embedded pain messages respect NO_PAIN.
2015-08-12 23:38:44 -04:00
99e1d88285
Fixes #10592
...
Fixes the right hand being affected if the left arm was broken.
2015-08-12 22:41:30 -04:00
62ad3a7be4
Fixes #10593
...
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
2015-08-12 22:24:14 -04:00
792d6e2864
Merge pull request #10579 from mwerezak/misc
...
Fixes
2015-08-12 22:21:34 +01:00
74f9e6ce63
Fixes #10552
2015-08-12 16:45:45 -04:00
7a86d6e658
Fixes #10571
...
Adds another snowflake electronic item to the can_hold list.
2015-08-12 16:06:31 -04:00
19fbc71249
Removes req_amount from stack_recipe_list
...
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572 .
2015-08-12 15:54:16 -04:00
3e6889927e
Fixes #10500
2015-08-12 15:26:57 -04:00
a43f77b070
Gives hydro soil recipe a better name
...
Gives the hydro soil recipe a name that better conveys it's purpose.
2015-08-12 15:25:01 -04:00
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
5b6c5ee5ce
Merge pull request #10570 from Zuhayr/master
...
Couple of fixes.
2015-08-12 15:00:36 -04:00
PsiOmegaDelta