Commit Graph

489 Commits

Author SHA1 Message Date
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud
255dd726c5 Plasma Cutter Rebalance 2015-08-15 17:28:30 -04:00
DZD
68e8fb6162 Span changes 2015-08-09 19:23:49 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c Various fixes, changes, additions, and removal of old features.
More changes
2015-07-10 19:41:27 -04:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
TheDZD
b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires
Pools Hotspots
2015-07-05 17:51:20 -04:00
Fox-McCloud
44881a4016 Tweaks a Few Destroy()'s 2015-07-05 04:51:47 -04:00
Fox-McCloud
a878ccee30 Pools Hotspots 2015-07-04 09:34:03 -04:00
Tigercat2000
bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Tigercat2000
f916eb7e2d Fix a few ex_act's. 2015-06-21 18:40:00 -07:00
Tigercat2000
7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Tigercat2000
d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud
93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00
ZomgPonies
bb02973e49 Merge pull request #1288 from Fox-McCloud/singularity-OOP
Singularity and Narsie Refactor
2015-06-13 04:18:40 -04:00
Fox-McCloud
2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Krausus
1389f0eb9b A couple istype->ishuman replacements 2015-06-10 11:02:54 -04:00
Krausus
a67021784f Fixes issues with change projectiles
Fixes dropping organs/limbs, cyborgizing runtimes, transfer of
non-wizard spells, transformation attack logging, and transformation
into unintended species
2015-06-10 09:29:13 -04:00
Krausus
94c2c3cca2 Removes two old/unused/redundant magical projectiles 2015-06-10 07:45:05 -04:00
veganzombeh
1c58d700c5 Fixes power glove lightning not calling bullet_act. 2015-06-07 13:11:56 +01:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
ZomgPonies
d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
DZD
8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm
2015-04-21 18:56:34 -04:00
ZomgPonies
8ce0212850 Final fixes 2015-04-21 18:05:43 -04:00
ZomgPonies
1b4bfe1196 Removing all mutantrace crap except for slimepeople 2015-04-13 06:20:17 -04:00
ZomgPonies
55dbbc32b5 Might as well update golems also 2015-04-13 06:05:42 -04:00
ZomgPonies
1be205df11 Shadowpeople update 2015-04-13 01:06:39 -04:00
DZD
00035a51f0 It compiles!
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
Fox-McCloud
0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Fox-McCloud
56d6d7c9c8 Fixes 2015-03-26 10:27:04 -04:00
Mark van Alphen
69fb729dc1 Merge pull request #626 from Fox-McCloud/Guns-Fixes
Teleporter Gun, Fixes, and Tweaks
2015-03-23 15:38:44 +01:00
Fox-McCloud
d9a257c890 Teleporter Gun, Fixes, and Tweaks 2015-03-22 02:45:02 -04:00
Fox-McCloud
094b6e506e Dragon's Breath Fix 2015-03-20 15:33:27 -04:00
SamCroswell
addfbe449e Adds Shuriken 2015-03-09 21:28:28 -04:00
Fox-McCloud
85d79677b1 Fixes, Genetics, and Balance 2015-02-24 22:58:05 -05:00
ZomgPonies
1f5ef8d4dd Merge pull request #380 from Markolie/master
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
Markolie
efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Fox-McCloud
edde2d10c6 Dart and Syringegun 2015-02-21 09:54:02 -05:00
Fox-McCloud
8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
DZD
add99533fc Practice and Lasertag Logs
- Adds ability to turn off admin chat logging for specific projectiles.
- Turns off admin chat logging for practice laser and lasertag beams.
2015-01-22 12:06:30 -05:00
DZD
3939abaf5d Fix Conflicts and Sync with Upstream
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
Fox-McCloud
73d59113c3 Kinetic Accelerator 2015-01-15 21:58:51 -05:00
DZD
62c76ba2ef Wizard Update Part 6
- Attempt to fix back sprite for new staffs.
- Fireball wand now has a proximity detonation similar to the fireball
spell.

Ported from /tg/.
2015-01-15 15:50:10 -05:00