Commit Graph

30 Commits

Author SHA1 Message Date
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
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
Tigercat2000
7f4ac72910 Progress bars + Wall Rationalization
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Fox-McCloud
6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04: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
Tigercat2000
b7e5aa5597 FIX: Attack logs being backwards
This commit fixes attack logs being backwards on some erroneous add_logs
arguments.

Things fixed:
 - Martial arts
 - EMP Flashlight
 - Defibrillator
 - C4
 - Handcuffs
 - Resonant Fields
 - Alien Larva attack_animal
 - Mobs being grabbed
2015-05-16 04:41:37 -07: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
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
Iamgoofball
e5264815ee GOONCHEM 2015-03-24 02:04:47 -07:00
Mark van Alphen
1a8c0f43a8 Merge pull request #398 from SamCroswell/master
Compact Defib - Overlay Fix
2015-02-24 00:03:11 +01:00
SamCroswell
4a439b67ba Compact Defib - Overlay Fix
The compact defib units now use the belt overlay, as opposed to the
back-mounted ones.
2015-02-23 17:53:28 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
DZD
a299793ab8 Makes code compile again
Fixing merge conflicts had the sideffect of adding one instance of
canremove, and one of drop_from_inventory.
2015-02-18 13:50:36 -05:00
DZD
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds
Sounds
2015-02-17 18:44:54 -05:00
Markolie
d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Markolie
4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Fox-McCloud
a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
fde761f42a Rejuv fix 2015-01-17 02:37:46 +01:00
Markolie
b3075f0704 Simplify and cleanup IPC/defib revival after messy fixes 2015-01-13 17:33:46 +01:00
Markolie
328fb13704 Attempted defib fix 2014-12-23 17:25:09 +01:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
Rob Nelson
7892eeb7cc Standardize LASER, NOCLONE, and HUSK
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:59:53 -05:00
Rob Nelson
d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00