Commit Graph

3219 Commits

Author SHA1 Message Date
phil235
09984d5ee0 ATTACK_HAND in aliens:
Moving attack_hand for larva+humanoid to alien/attack_hand() in alien_defense to handle both.
Changing weaken() to paralyze() in alien/attack_hand() in hulk and disarm section because weaken fails on aliens.
lowered alien bite damage on alien to just 1 in all cases, instead of rand(1,3) for humanoid->humanoid.
Added alien/attack_hand() to handle both larva and humanoid, with override in the children.
Adding a death message for the larva.

Attack_paw for aliens: handled in alien/attack_paw() and overridden in children.

Attack_animal for aliens: handled in alien/attack_animal() in alien_defense.dm

Added attack logs where missing.
2014-11-05 18:54:54 +01:00
phil235
ea1daa40d5 moved attack_slime to carbon/alien to handle both larva and humanoid, with a little override in larva and humanoid.
Created proc/grabbedby in mob/living/living_defense.dm to handle all grab stuff in the attack_hand's and attack_alien's.
Fixed typos in messages.
one attack_larva gets a return attack_alien for its harm part.
Fixing larva attack on larva, couldn't help a fellow larva.
moving humanoid/attack_larva to alien/attack_larva() to handle both humanoid and larva being attacked by larva.
Fix a bug with attack_slime where you could glomp a dead humanoid indefinitely.
2014-11-05 17:42:40 +01:00
Cheridan
df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3
improved deconstruction, singularity stuff
2014-11-03 20:20:55 -06:00
hornygranny
e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns
Acid Rework
2014-11-03 18:11:49 -08:00
hornygranny
38b4f50e3e Merge pull request #5630 from GunHog/Soft_Silky_Hair
Adds three new hairstyles by Mandurrrh!
2014-11-03 17:37:55 -08:00
hornygranny
3d09f8031a Merge pull request #5632 from GunHog/Botcall_Lagfix_TryTwo
Botcall Fix for MC lag + Tweak to floorbots Take Two
2014-11-03 17:35:16 -08:00
hornygranny
d7b3b64c7a Merge pull request #5619 from MrPerson/I_know_this_should_be_two_prs_but_fuck_it
Cyborg law additions
2014-11-03 17:27:42 -08:00
hornygranny
8b4ab665cb Merge pull request #5490 from tkdrg/hiasl
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
hornygranny
d79ccb4883 Merge pull request #5608 from tkdrg/whynamesandnotbodies
Creates the "Always use random body" option
2014-11-03 17:16:08 -08:00
hornygranny
b4cc33e64e Merge pull request #5593 from tkdrg/investment
Adds cargo and secrecords to admin_investigate
2014-11-03 17:14:23 -08:00
hornygranny
c12f67dae7 Merge pull request #5507 from tkdrg/xenonecrophilia
Facehuggers no longer violate the dead
2014-11-03 17:11:02 -08:00
hornygranny
85016d7f38 Merge pull request #5493 from tkdrg/pullingyourleg
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
hornygranny
cf7de8d24d Merge pull request #5485 from MrPerson/emo_logging
Fixes slimes and borgs not emote logging
2014-11-03 17:08:38 -08:00
tkdrg
0335c4adec Makes ghostpointing invisible (thanks PsiOmegaDelta!) 2014-11-03 18:19:20 -03:00
Remie Richards
c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
GunHog
7f41894319 Gives bots their own place in the MC!
- Adds bots to the Master Controller as their own datum instead of
machines.
- Puts bots into their own global list.
- Processes bots asynchronously so as to not hold up the MC processing
them.
2014-11-03 12:39:07 -06:00
Cheridan
5d7993eb75 Merge pull request #5602 from tkdrg/ihavenohandstopullyouwith
Slimes can no longer pull
2014-11-03 10:19:27 -06:00
MrPerson
8d7d302053 Fixes the world's worst typo and adds a changelog 2014-11-03 00:42:02 -08:00
GunHog
d8efbc4f07 Botcall Fix for MC lag + Tweak to floorbots
- Attempts to fix a major screwup in bot movement code that created
artificial lag for the entire Master Controller.
- Fixes floorbots not patrolling or performing certain functions.
- You can now toggle the anchored status on Floorbots manually. They
will still automatically anchor when fixing hull breaches.

Allow me to apologize for taking so long to come up with a fix for this.
I tried several other solutions such as simply removing the sleep(4)
that causes this issue (it results in 'teleportation' movement). Other
times I used spawn() incorrectly, resulting in several race conditions.
And then I tried to give them their own ticker, independent of the MC.
The game lagged and runtimed before it even finished setting up.

Excuses aside, this solution seems to be working so far, but I welcome
any more elegant solutions to fixing this issue.

fixes #5560
2014-11-02 19:01:43 -06:00
GunHog
a9c5667ab6 Adds three new hairstyles!
-Adds the High Ponytail, Long Ponytail, and Long Side Part hairstyles!
2014-11-02 18:06:53 -06:00
tkdrg
9140006256 Fixes ghost pointing 2014-11-02 15:24:03 -03:00
Cheridan
cf5df74a27 Merge pull request #5540 from phil235/botRepairFix1
adding CoolDown to welding repair on bot/borg/mecha
2014-11-02 12:12:19 -06:00
tkdrg
7ebc4bb742 Merge remote-tracking branch 'upstream/master' into pullingyourleg
Conflicts:
	code/modules/mob/mob.dm
2014-11-02 14:40:37 -03:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
MrPerson
d78beb1c93 Cyborg law additions
Allow direct usage of law modules onto unslaved borgs
Lock newly emagged borgs down until their new laws are shown. Fixes #5587
2014-11-02 04:46:38 -08:00
Cheridan
47c2e9339b Merge pull request #5567 from MrPerson/my_little_droney
Hopefully fixes that runtime where drones could wind up in nullspace.
2014-11-01 22:39:17 -05:00
tkdrg
30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl
Conflicts:
	code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
Hornygranny
b16ed90db1 Merge branch 'OOPgularity3' of https://github.com/hornygranny/-tg-station 2014-11-01 13:29:46 -07:00
tkdrg
8a93247ef8 Creates the "Always use random body" config option 2014-11-01 16:48:42 -03:00
tkdrg
7ab17964d6 Slimes can no longer pull. 2014-11-01 16:15:42 -03:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
tkdrg
b030d0b432 admin_investigate will now log sec/med records deletion as well. 2014-11-01 13:25:09 -03:00
Remie Richards
0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
tkdrg
977a1c3de1 Merge remote-tracking branch 'upstream/master' into investment
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-31 23:23:00 -03:00
tkdrg
f995b2e94b Adds cargo and secrecords to admin_investigate 2014-10-31 23:20:33 -03:00
Hornygranny
955847de74 defines 2014-10-31 19:00:50 -07:00
Remie Richards
24b6e9c601 Merge pull request #5506 from hornygranny/OOPgularity2
makes the singularity's pulling OOP and insanely deadly
2014-10-31 23:13:11 +00:00
Cheridan
c8b5f99cf4 Merge pull request #5505 from phil235/AtkMsgFix1
/item/weapon with force 0 can no longer knock humans down
2014-10-31 10:02:19 -05:00
Hornygranny
9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/game/turfs/simulated/floor.dm
2014-10-30 17:26:25 -07:00
MrPerson
00cf1a4f50 Hopefully fixes that runtime where drones could wind up in nullspace. 2014-10-30 15:52:24 -07:00
tkdrg
ab6ca61e2a Lets AIs and pAIs use the chatroom function in their built-in PDAs. 2014-10-29 19:32:23 -03:00
tkdrg
a5ab00975b Moves pulled() to /mob/living, lets ghosts point (only other ghosts can see the pointing) 2014-10-29 17:53:41 -03:00
phil235
49921a9bb1 adding CoolDown to welding repair on bot/borg/mecha
Now eye prot needed to repair bot/borg/mecha
fix bug where you're repairing despite weldingtool being off
Fixes the amount of fuel used per repair to 1 for bot/borg/mecha
Adding message when not enough fuel during borg/mecha repair.
Fuel not used when repair attempt on borg/mecha is canceled (no damage or welder off).
For bot/borg/mecha, now using notice span class for all repair messages and visible message instead of << . All cancel messages uses warning span class.
2014-10-29 16:50:13 +01:00
GunHog
a216b7024e Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
Cheridan
1aef19c835 Merge pull request #4974 from GunHog/Botcall_TG_Edition
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
Remie Richards
2705d0273e Damages /living mobs too. 2014-10-29 00:25:46 +00:00
Hornygranny
cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-28 15:27:46 -07:00
Remie Richards
07ff02b7c4 Merge pull request #5477 from MrPerson/space_movement_jam
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
Remie Richards
2da228084b Updates monkey acid_act(), it was actually an older draft (still functional, but message spammy) 2014-10-28 19:15:48 +00:00