96 Commits

Author	SHA1	Message	Date
Neerti	4f77afece1	Revert 58ef59734f	2015-11-08 10:09:14 -05:00
Dibasic	c905fb9bc7	Reduces wizard subjugate duration ... Reduces wizard subjugate duration to one third of previous duration. General agreement in this thread: http://baystation12.net/forums/threads/vote-remove-wizard-subjugate.1007/ Because a robeless spell shouldn't take you out of the round for as long as the respawn timer lasts.	2015-10-27 15:14:40 -05:00
PsiOmegaDelta	0b9b8feb1e	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm	2015-10-21 10:38:57 +02:00
PsiOmegaDelta	db833735a8	Merge pull request #11340 from Baystation12/master ... Dev-freeze.	2015-10-21 10:36:30 +02:00
PsiOmegaDelta	b92be265ee	Limits the number of runes to one per turf. ... Fixes #11248.	2015-10-19 12:49:32 +02:00
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
HarpyEagle	380b89fcc0	Fixes #11130, renames aghosted var ... because it is no longer used solely for aghosting.	2015-09-26 20:48:13 -05:00
Zuhayr	c8baafed2a	Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and ... construction/deconstruction. Major map rework/changes.	2015-08-16 06:05:21 -07:00
PsiOmegaDelta	3a55b130a0	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: .travis.yml code/modules/virus2/disease2.dm maps/exodus-5.dmm	2015-08-14 08:34:42 +02:00
PsiOmegaDelta	ccf6fa285d	Removes Flesh to Stone fully. ... Fixes #10600.	2015-08-13 08:25:03 +02:00
GinjaNinja32	005dcda1d5	Macro count update, fixes span tag	2015-08-11 18:52:24 +01:00
GinjaNinja32	631ff21980	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/game/gamemodes/cult/runes.dm code/game/objects/items/weapons/implants/implantcase.dm code/game/objects/items/weapons/melee/energy.dm code/modules/mob/living/carbon/human/emote.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/silicon/robot/drone/drone.dm code/modules/mob/living/silicon/robot/emote.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/nano/modules/crew_monitor.dm code/modules/organs/organ_internal.dm	2015-08-11 18:47:05 +01:00
PsiOmega	78ffb5835a	Misc.	2015-08-11 17:33:03 +02:00
PsiOmegaDelta	3185005496	Fixes #10410. Fixes #10411. ... Removes improper code, that would cause spell projectiles to be deleted pre-maturely as well as cast the spell effect all too often. Also removes completely unused code.	2015-08-11 13:36:56 +02:00
PsiOmegaDelta	54162f1c7d	Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes	2015-08-11 12:20:54 +02:00
PsiOmegaDelta	5cbb703609	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/_helpers/unsorted.dm code/game/jobs/access.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/update_icons.dm code/modules/organs/organ.dm code/modules/reagents/Chemistry-Holder.dm code/setup.dm	2015-07-27 10:20:20 +02:00
Mloc	65ac3d97d0	Revert "get rid of mob.see_in_dark and species.darksight" ... This reverts commit 278a4c38ec.	2015-07-22 15:14:40 +01:00
PsiOmegaDelta	617db485ee	qdel/Destroy entries.	2015-07-21 14:22:01 +02:00
PsiOmegaDelta	1c7b860783	Spells are now restored when cloning.	2015-07-21 11:34:26 +02:00
PsiOmegaDelta	616b4b60e4	Magical fixes. ... The wizard den is no longer pitch black. Fixes targeted spells using the wrong caster/source. Adds some missing checks using the caster source above. Re-logging should no longer cause a loss of spell UI icons. Mind transfer should no longer cause unintended spell loss.	2015-07-21 11:34:25 +02:00
GinjaNinja32	0c1aee8074	Fixes <span class='class>, makes Travis check it	2015-07-18 21:13:32 +01:00
PsiOmegaDelta	34fdc4712e	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/_helpers/names.dm code/game/jobs/job/silicon.dm code/game/objects/items.dm code/modules/mining/abandonedcrates.dm code/modules/mob/living/carbon/brain/life.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/simple_animal/friendly/spiderbot.dm code/modules/nano/modules/alarm_monitor.dm code/setup.dm	2015-07-14 08:21:12 +02:00
Zuhayr	5e1ae26b74	Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.	2015-07-14 05:19:01 +09:30
Zuhayr	52cc850bf8	Merge pull request #10115 from PsiOmegaDelta/150712-SolidJaunting ... Wizards can no longer de-jaunt in turfs with dense objects.	2015-07-13 06:14:44 +09:30
PsiOmegaDelta	2ed978b1e1	Wizards can no longer de-jaunt in turfs with dense objects. ... Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.	2015-07-12 14:31:26 +02:00
Mloc	278a4c38ec	get rid of mob.see_in_dark and species.darksight ... They don't work with the current lighting system and cause weird artifacts. Signed-off-by: Mloc <colmohici@gmail.com>	2015-07-09 19:17:04 +01:00
Zuhayr	48cf00ca54	Merge with dev-freeze.	2015-06-21 20:45:47 +09:30
mwerezak	f8d5127078	Adds SLOT_EARS to various items	2015-06-21 01:45:43 -04:00
PsiOmega	0a05c2659f	All the span-corrected dm files.	2015-06-14 22:08:14 +02:00
PsiOmega	ee88e7b8b4	Base Life-addition()	2015-06-13 13:36:08 +02:00
Yoshax	7b19c85ac5	Makes file use user and not usr	2015-06-05 19:04:11 +01:00
Yoshax	afe081d836	Makes scrying orb only usable by wizards	2015-06-05 18:35:19 +01:00
Yoshax	c960fad48e	Changes teleportation scroll and spellbook to be only usable by wizards	2015-06-04 20:21:31 +01:00
Mloc	16d50c645d	new object-based lighting system ... Signed-off-by: Mloc <colmohici@gmail.com>	2015-05-10 20:54:25 +01:00
Kelenius	b7a628d53d	Merge branch 'dev' into ofBotsAndMobs ... Conflicts: code/game/machinery/bots/cleanbot.dm code/game/machinery/bots/ed209bot.dm code/game/machinery/bots/farmbot.dm code/game/machinery/bots/floorbot.dm code/game/machinery/bots/medbot.dm code/game/machinery/bots/secbot.dm code/game/objects/items/robot/robot_parts.dm	2015-04-26 17:18:20 +03:00
PsiOmega	e7d85f8edc	Adds Destroys.	2015-04-24 17:11:14 +02:00
PsiOmega	1ae0ad6d92	Updates the atom_pool, now datum_pool, to handle any datum object. ... Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.	2015-04-24 09:59:05 +02:00
PsiOmega	d381eb6083	Drops the machinery part of the singularity.	2015-04-16 12:51:02 +02:00
PsiOmega	990530d118	Ports /vg/'s spell system for the sake of cult porting. ... Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.	2015-04-09 20:08:06 +02:00
PsiOmega	71a8ddf50e	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/game/gamemodes/cult/runes.dm code/modules/paperwork/paper.dm code/modules/projectiles/projectile.dm	2015-04-08 10:55:26 +02:00
mwerezak	9ad533a094	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/mob/living/carbon/monkey/update_icons.dm code/modules/mob/mob_helpers.dm code/modules/spells/spellbook.dm icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi	2015-03-31 00:16:56 -04:00
PsiOmega	710abd0921	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/spells/mind_transfer.dm	2015-03-29 16:23:06 +02:00
Zuhayr	ba648e3e8d	Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.	2015-03-26 12:45:12 +10:30
Zuhayr	d26800d29c	Preliminary work on converting all monkeys to a human subspecies.	2015-03-25 02:15:45 +10:30
Zuhayr	98da191ac3	Gamemode refactor, lots of code shuffles, PR will have details.	2015-03-21 11:08:17 +10:30