Commit Graph

85 Commits

Author SHA1 Message Date
Leshana e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
PsiOmegaDelta ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Neerti ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Anewbe 4cf38d9037 Should fix throwing people. 2017-04-13 23:38:16 -05:00
LorenLuke 452f1fad9b Merge branch 'master' into Grab-Throw-Fix 2017-04-13 19:29:40 -07:00
LorenLuke a0eecc9f45 Fixes grabs not being able to throw (sorry... :c ) 2017-04-13 19:28:10 -07:00
LorenLuke faf85774b5 Resisting out of choking grabs isn't 100% guaranteed anymore. Tweaked some ling checks to compensate. 2017-04-11 01:16:03 -07:00
Anewbe ec7dbc1930 Renames the proc for headbutting 2017-04-05 15:55:35 -05:00
Anewbe 2b81c0ed63 Merge pull request #2525 from Neerti/9/21/2016_w_class_defines
Centralizes weight class / inventory definitions
2016-09-22 16:46:05 -05:00
Neerti 828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Yoshax 653610e194 Adds the ability to apply pressure to bleeding wounds 2016-09-21 22:22:47 +01:00
HarpyEagle f0c8e0e516 Makes smaller mobs have smaller organs 2016-06-20 00:26:44 +01:00
Yoshax cf76d6dac4 Fix stuff 2016-06-20 00:18:34 +01:00
HarpyEagle 8fc62cdbbc Small mobs can no longer pin larger mobs 2016-06-20 00:09:37 +01:00
HarpyEagle 69dd0bb5d0 Makes it easier to break free of a grab by a smaller mob 2016-06-20 00:09:28 +01:00
HarpyEagle fd3a3175ae Moving while unable to move and grabbed acts as a shortcut for resist 2016-06-20 00:08:36 +01:00
Hubblenaut 677e18dbaf Removes people being able to pull from somebody's grab 2016-03-23 18:29:41 +01:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Zuhayr f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
PsiOmega affff253bc Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/living.dm
	code/modules/mob/mob_grab.dm
2015-09-02 14:58:13 +02:00
Zuhayr 1d13b989df Gluttonous var changes. 2015-08-22 03:33:18 +09:30
Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
mwerezak 7f17505e48 Cleans up mob_grab.dm
Moves all of the grab abilities into their own proc instead of having them all dumped into /obj/item/weapon/grab/attack().
2015-08-18 22:02:01 -04:00
mwerezak b80c01ffbe Removes *COVERSEYES
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
Kelenius 60196df634 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
mwerezak 33fe2b5fc7 Makes grab eye attacking respect species lore better 2015-07-14 00:25:53 -04:00
mwerezak 32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
PsiOmegaDelta e7faa19ea3 Merge pull request #9779 from Baystation12/master
Dev-freeze.
2015-06-10 11:04:54 +02:00
PsiOmega 3591bd5599 Travis now builds using version 508.1287
throw is now a keyword. Updates usages where necessary to allow compilation.
2015-06-09 15:36:27 +02:00
Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
2015-06-07 14:05:54 +03:00
Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
Chinsky 97b2a63b76 Missed one baddie
Pretty sure that limb rotting alive is unhealthy yeah
2015-05-21 03:22:20 +03:00
Chinsky df917e1538 Changes from PR feedback. Moar feedback for inspecting mob. 2015-05-19 07:16:17 +03:00
Chinsky ef0f21bd1a Ghetto MD part 2
Examining people with grab-exmaine move now can tell you if they have toxins in blood, or are short of breath.
Stethoscopes now actually give real info about severe oxyloss/internal organs damage.
2015-05-18 07:45:29 +03:00
Chinsky 26e5630e23 Ghetto diagnostics!
Grab + click with help intent to inspect the bodypart. You'll learn what injuries there are without stripping the guy. After delay, you also learn if there's a fracture here.
Also surgical incisions are now visible on examine because goddamnit.
2015-05-18 06:37:51 +03:00
GinjaNinja32 363ce0a925 Fixes grabs runtiming on qdel() 2015-05-15 00:07:45 +01:00
Hubblenaut 32b463237f Final adjustments to icons, adds delay to pinning 2015-05-12 17:21:37 +02:00
Hubblenaut 1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
2015-05-12 14:39:21 +02:00
Hubblenaut fb8812d1b7 Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
fixup
2015-05-10 17:54:34 +02:00
PsiOmega fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
Kelenius 3fa79f8d51 Removes click cooldowns almost everywhere.
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
PsiOmega 3866fda394 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
mwerezak 8b32d2356e Fixes #9044
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -04: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
Hubblenaut 8528948bcd Adds blinding/muzzling and changes trigger for jointbreaking 2015-04-19 20:17:28 +02:00
Hubblenaut a40ef85a5f Merge branch 'grab' into dev
Conflicts:
	icons/mob/screen1.dmi
2015-04-19 16:00:28 +02:00
Hubblenaut ea49978958 Grab Basics 2015-04-01 19:07:39 +02:00
Zuhayr ba648e3e8d Updated ismonkey(), refactored kitchen spike, refactored plastic flaps. 2015-03-26 12:45:12 +10:30