Markolie 3b1dc8e487 Merge branch 'master' of https://github.com/ZomgPonies/Paradise ...

Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm

2014-11-27 21:39:01 +01:00

..

camera

…

dead

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

living

Merge branch 'master' of https://github.com/ZomgPonies/Paradise

2014-11-27 21:39:01 +01:00

new_player

Adds Mortician, vomit mask fix, fix for missing images for various jobs

2014-11-26 20:44:06 +01:00

spirit

Confirmation screen for become mask

2014-10-21 22:29:23 +01:00

abilities.dm

…

death.dm

…

emote.dm

…

holder.dm

…

inventory.dm

Hardsuit equip time reversion

2014-10-18 01:46:28 +01:00

language.dm

…

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)

2014-07-23 11:04:07 -04:00

mob_grab.dm

…

mob_helpers.dm

Merges taser and stun baton effects

2014-08-03 15:59:21 -04:00

mob_movement.dm

Spacepod movement fix

2014-07-30 05:46:47 +01:00

mob_transformation_simple.dm

…

mob.dm

Bug fixes, wording changes

2014-11-25 22:56:12 +01:00

say.dm

…

transform_procs.dm

Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes

2014-11-23 07:52:38 +01:00

update_icons.dm

…