ab8422f5aa
More hull resistance tuning
2014-01-11 06:01:30 -05:00
c8bc025cc7
Fix holywater hurting full power vampires
2014-01-11 04:41:32 -05:00
a61c82e3fb
Updated explosion stuff. Less hull breaches.
2014-01-11 02:25:45 -05:00
4f405f2ed7
A few numbers change for reagents
2014-01-11 01:51:31 -05:00
f62de1ca2e
Added spider butchery
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
icons/mob/animal.dmi
2014-01-11 00:21:42 -05:00
27c35cfdac
Added spider meat recipes
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-01-11 00:16:12 -05:00
9dedba21cf
Talisman icon fix
...
Makes talismans keep looking like talismans for more than a tick.
2014-01-11 00:04:09 -05:00
600bfba275
Colour fix for bread slices.
2014-01-11 00:02:07 -05:00
2f0cb6635b
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
2014-01-11 00:01:34 -05:00
2cd1580acd
Added filling_color var to food items for use in sandwiches.
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
2014-01-10 23:56:24 -05:00
1bbc25d52e
Fixes
2014-01-10 23:45:20 -05:00
a97f985200
Adds developer-level access to ZAS settings.
...
Fixes bug which would always let heat move through doors.
Conflicts:
code/modules/admin/admin_verbs.dm
2014-01-10 23:41:43 -05:00
229c8946ff
Fixes derpiness with ZAS heat transfer.
2014-01-10 23:34:02 -05:00
d0229a479b
Fixes ZAS silliness with SoftDelete
2014-01-10 23:32:47 -05:00
43ea65341c
Fixes to giant spider abilities
2014-01-10 03:21:20 -05:00
5a061d770f
Fix #381 - Poster duping
2014-01-10 02:04:20 -05:00
2b1e308e31
Fix #384 - Fridges can be opened while welded shut. Also discovered this extended to secure lockers.
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
html/changelog.html
2014-01-10 02:03:51 -05:00
ea5784a4aa
Fix for #382 - Bombs not deleting themselves and the fridge they're in.
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2014-01-10 02:02:34 -05:00
dbe20f8216
Fix for #383 - C4 deleting fridges full of corpses.
2014-01-10 02:01:19 -05:00
5b6648a2c9
Fix #384 (possibly): Welding a fridge/freezer does nothing.
2014-01-10 02:00:51 -05:00
9fdde1eec7
Fix #388 : Incorrect C4 timing checks.
...
Conflicts:
code/game/objects/items/weapons/explosives.dm
2014-01-10 01:59:07 -05:00
da6b615e44
Adjacent didn't work, back to using get_dist.
2014-01-10 01:56:45 -05:00
4a6601eef1
Merge pull request #113 from SamCroswell/master
...
Major Ninja Patch
2014-01-09 19:31:38 -08:00
70d16798b5
Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
2014-01-09 21:22:51 -05:00
e1203f9320
Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
2014-01-09 21:13:31 -05:00
43ad9cceb7
Reverts some geometry code to a functional state.
...
Fixes #4045
2014-01-09 21:06:06 -05:00
b5906bba39
Tradeband and Gutterspeak now have a different font than Tradeband.
...
Fixes #4143
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/new_player/new_player.dm
2014-01-09 21:05:36 -05:00
4b532372d7
Extra var
2014-01-09 21:01:44 -05:00
e4fdc17405
Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.
...
Fixes #2485
Conflicts:
code/game/turfs/simulated/floor_types.dm
2014-01-09 20:59:31 -05:00
0be7c1c9a2
Fix for mining.
...
Fixes #4249
2014-01-09 20:57:47 -05:00
e2bbbb7e39
Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
...
Conflicts:
code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
c980a4a421
Major Ninja Patch
2014-01-09 20:39:29 -05:00
d101e5c111
RCDs no longer create plating with air on it.
...
Fixes #3545
2014-01-09 20:26:28 -05:00
330be31466
Tweaks the zone rebuilding logic to prevent doors being ignored.
...
Fixes #4046
2014-01-09 20:26:03 -05:00
94f38882f9
Removes braindeath as IC term
2014-01-09 20:24:10 -05:00
3789e82f7b
Roasted diona, for ZomgPonies/Paradise.
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-01-09 09:14:20 -05:00
f92a066458
Objectives will now updated when the target enters cryostorage.
2014-01-09 08:01:10 -05:00
cea3b61a78
Fixes some items remaining after the pod procs.
2014-01-09 08:00:48 -05:00
a56440ad48
Patched holes in SoftDelete that were causing null reference errors.
...
Fixes #3892
2014-01-09 05:53:18 -05:00
05e7f65ede
Fixing up borer control
2014-01-09 05:29:28 -05:00
9bdae9ff75
Fix fire extinguishers bluespacing their contents afar when dumping.
...
Also use Adjacent so we can't dump through windows.
Conflicts:
code/game/objects/items/weapons/extinguisher.dm
2014-01-09 05:09:51 -05:00
2b87fcf581
Upgradeable Laser Pointers!
...
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
Conflicts:
code/game/objects/items/devices/laserpointer.dm
2014-01-09 04:20:08 -05:00
a405189383
Cult construct abilities fix
2014-01-09 03:03:41 -05:00
a59772e5e2
Merge pull request #112 from alex-gh/reagent-fix
...
typo fix
2014-01-08 21:19:22 -08:00
404ee2ac1f
typo fix
2014-01-09 06:02:45 +01:00
e4acf730d7
Fixed ninja objectives not showing up in check antag
2014-01-08 21:51:18 -05:00
c14adc6724
Slimes split from a killed adult can understand humans. ( #366 )
...
Conflicts:
code/modules/mob/living/carbon/metroid/death.dm
html/changelog.html
2014-01-08 21:49:15 -05:00
c7215da925
Fix #371 (vermin trying to spawn in assembly line). plus other simple_animal issues.
...
Conflicts:
code/modules/events/infestation.dm
html/changelog.html
2014-01-08 21:49:14 -05:00
b12e6bfd31
Merge pull request #111 from SamCroswell/master
...
Ninja Death-splosion fix
2014-01-08 18:31:57 -08:00
e55ba73100
Minor fix for NanoUI
...
* I was passing src instead of src_object in try_update_ui, this is fixed now.
* Changed checks to use the isnul procl, just to be sure.
2014-01-08 21:22:00 -05:00
ZomgPonies