cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 03:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,177 Commits 61 Branches 14 Tags
71efbeef26d4d045bec29d212cdef6eae1f00e4e
Commit Graph

3257 Commits

Author SHA1 Message Date
hornygranny
71efbeef26 Merge pull request #5213 from Miauw62/whatthefuckareyouevensupposedtocallthesebranchesffs 
Fixes whisper formatting hopefully maybe.
 2014-11-08 15:12:59 -08:00
hornygranny
28592a230e Merge pull request #5737 from phil235/GrabbyPunchyFix 
Adding a NOBLUDGEON check to simple_animal/attackby()
 2014-11-08 15:07:18 -08:00
Cheridan
53bf024dbe Merge pull request #5545 from RemieRichards/DiseaseRework 
Disease Code Partial Rework
 2014-11-08 00:17:47 -06:00
Cheridan
a9d1963eb6 Merge pull request #5723 from Aranclanos/hideclown 
Hiding the jumpsuit with HIDEJUMPSUIT exosuits
 2014-11-07 23:58:33 -06:00
Cheridan
e49e4efe29 Merge pull request #5704 from phil235/TypoFix1 
Fixes the ability to beat up a pAI.
 2014-11-07 23:52:31 -06:00
Cheridan
9721c6fb6f Merge pull request #5724 from Aranclanos/suicidestuff 
Reworked a bit the suicide verb
 2014-11-07 23:47:15 -06:00
hornygranny
efb3877fcf Merge pull request #5682 from paprka/fixdefib 
Defibrillator Hotfixes
 2014-11-07 19:49:04 -08:00
Remie Richards
e84beec0e2 more conflict fixes. 2014-11-08 01:22:27 +00:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-11-08 01:07:29 +00:00
Cheridan
7974b77dfa Merge pull request #5703 from phil235/AttackHandFix 
Less copypasta in mob attack procs
 2014-11-07 18:06:45 -06:00
phil235
2d04cbc39c Fixing the merge conflicts. 2014-11-07 22:31:26 +01:00
phil235
1d96ef944d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackHandFix 
Conflicts:
	code/game/machinery/turrets.dm
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	code/modules/mob/living/carbon/alien/larva/larva.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2014-11-07 21:47:18 +01:00
Cheridan
594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization 
Text input sanitization (take 1)
 2014-11-07 13:56:20 -06:00
Cheridan
7f3040f708 Merge pull request #5697 from Aranclanos/AIemotes 
AI emotes
 2014-11-07 13:49:09 -06:00
phil235
8d0afc77fc Adding a NOBLUDGEON check to simple_animal/attackby() so you can't hit them with NOBLUDGEON items like grabs or goliath_hide. 2014-11-07 19:59:01 +01:00
Remie Richards
0914b1a7cd Merge pull request #5642 from phil235/AttackAnimation 
Adding an attack animation to most attacks
 2014-11-07 18:39:27 +00:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Aranclanos
ed1898e4df Uniform overlays will now be blocked from showing if the exosuit has the flag HIDEJUMPSUIT, preventing the own and clown suit from sticking out of spacesuit and others. 
Fixes issue #3881
 2014-11-06 18:16:17 -03:00
phil235
e5dd72cb8e Some absolute pathing fixed. 
Fixing some mistakes and typos.
Fixes many attacks on simple animals not checking the force_threshold.(adding attack_threshold_check() )
 2014-11-06 18:50:13 +01:00
Aranclanos
ead9b2a8bb Breathing won't check anymore if the person if committed suicide. 
People will be able to perform several suicides if they survived previous ones.
The examine suicide text will only appear if the person is dead.
 2014-11-06 13:48:41 -03:00
phil235
1649883425 Fixed some typos. 
Moved some attack procs from carbon.dm to carbon/carbon_defense.dm and from human.dm to human/human_defense.dm.
 2014-11-06 00:52:31 +01:00
phil235
f908befb36 attack_alien() moved to living/attack_alien() and overridden in the children. 
Adding missing attack logs.

Fixing some mistakes in attack_animal()'s

Attack_hand():
cyborg can now be grabbed
AI and cyborg can be punched, with damage only with hulk.
Rearranging the attack_hand() procs a bit.
Adding missing attack logs.
 2014-11-06 00:32:19 +01:00
phil235
2c54ea4f47 Attack_animal() is moved and handled in living/attack_animal() in living_defense.dm and overridden in children. 
Maybe fixes the animal emote not working (Ian nuzzles, etc)

moving attack_paw to living and nerfing it by making prob(75) apply to all living not just monkeys.

Attack_larva() is moved to living/attack_larva
Adding larva rubbing on silicon
Adding possibility to fail to bite the living as larva.

Adding missing attack logs
 2014-11-05 22:34:47 +01:00
Aranclanos
5d47ebc35c Made the cyborg emotes be instead for all silicons 
Fixes issue #3866
 2014-11-05 18:12:11 -03:00
phil235
dfbe73e80a Added attack logs where missing. 
Moving attack_alien for silicons to silicon/attack_alien() with overrides in children.
Fixing messages.

Attack_animal for silicons: all in silicon/attack_animal()

Attack_slime handled in living, overriden in its children.
Simplified the definition of the stunprob var, slight nerf to slime shock.
 2014-11-05 20:37:14 +01:00
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
phil235
20e90d1168 Fixes typos in message and icon. Fixes the ability to beat up a pAI. Adds a cooldown to attack_animal on mechs. 2014-11-05 14:45:47 +01:00
JJRcop
bfc62a78aa Changes the defibrillator to use HEALTH_THRESHOLD_DEAD as the max damage it heals 
Changes succumb to apply exactly the required amount of oxyloss to die, instead of a hard-coded 200
 2014-11-04 23:48:57 -05:00
phil235
1bf2574091 M not H. derp 2014-11-04 20:34:44 +01:00
phil235
48ad48acce Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR. 2014-11-04 20:30:04 +01:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation 
Conflicts:
	code/modules/mob/living/living.dm
 2014-11-04 18:55:07 +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
phil235
1506383b2c Adding some missing do_attack_animation() 
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
 2014-11-03 15:11:39 +01:00