Commit Graph

74 Commits

Author SHA1 Message Date
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
mwerezak
6479c909cd Updates grabs
Replaces broken client/Process_Grab(), makes resisting neck grabs
actually work. Fixes the grabbed_by list filling up with null entries
when a grab is broken. Aggressive grabs now prevent movement, can still
be quickly broken using resist or disarm. Neck grabs are easier to
resist if the grabber has moved recently. Some minor cleanup.
2015-02-17 23:40:51 -05:00
Zuhayr
8756bb99bd Adds species-specific comfort tweaks, skrell nutrition changes. 2015-01-20 19:12:35 +10:30
Zuhayr
409be10611 merge resolution, mostly removing attack_alien() from modified files. 2014-10-12 02:09:54 +10:30
mwerezak
7a81e116d2 Fixes #6647
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
2014-10-10 00:23:03 -04:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Mloc-Argent
f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-25 20:36:46 +00:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change.
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-13 13:10:09 +01:00
Mloc-Argent
7ba1638e11 Fixed some mob clicks.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-11 15:52:48 +01:00
Segrain
3c4b7507e9 Reactiveness 'quick'fix. 2013-07-28 13:02:10 +03:00