cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,056 Commits 61 Branches 14 Tags
09984d5ee0a9159bb0bc7d96e4a62a2d81bb4607
Commit Graph

12144 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
hornygranny
d88e1684ca Merge pull request #5658 from tgstation/revert-5432-outoftheleftfield 
Revert "Contaiment fields will now bounce off structures, machinery and mechs"
 2014-11-04 01:20:45 -08:00
Hornygranny
b7f0287469 fixes atmospherics not working 2014-11-04 01:10:18 -08:00
hornygranny
377f8bd1fa Revert "Contaiment fields will now bounce off structures, machinery and mechs" 2014-11-04 00:51:58 -08:00
hornygranny
b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes 
New Cigarette Packs
 2014-11-03 18:49:29 -08:00
hornygranny
05539c7d13 Merge pull request #5382 from TZK13/Asteroid-Toy 
Adds new meteor toys and space carp plushies to arcade machines
 2014-11-03 18:39:16 -08:00
Cheridan
df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3 
improved deconstruction, singularity stuff
 2014-11-03 20:20:55 -06:00
hornygranny
d5b8ed3155 Merge pull request #5460 from paprka/rdturtle 
Adds RD turtleneck and updates whimsy
 2014-11-03 18:18:18 -08:00
hornygranny
e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns 
Acid Rework
 2014-11-03 18:11:49 -08:00
hornygranny
e25479cece Merge pull request #5564 from paprka/defibsfinal 
[MAP] Defibrillators
 2014-11-03 18:08:30 -08:00
hornygranny
268dc0deed Merge pull request #5502 from tkdrg/ifitwasntforthosemeddlingadmins 
Creates the "Reset Telecomms Scripts" adminverb
 2014-11-03 18:01:10 -08:00
paprka
1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-11-03 17:57:40 -08:00
tkdrg
5019876316 Uses the machines list instead of world 2014-11-03 22:51:17 -03:00
hornygranny
415e0e507f Merge pull request #5629 from TZK13/Hearing-Fixing-Chemical 
Ports inacusiate from /vg/station, a chemical that instantly heals hearing damage and deafness
 2014-11-03 17:50:20 -08:00
hornygranny
06b1a080fe Merge pull request #5612 from tkdrg/upboat 
Adds newscaster comments.
 2014-11-03 17:49:24 -08:00
hornygranny
de22ca7aac Merge pull request #5354 from optimumtact/patch-1 
Remove click delay from pipe painter and adds adjacency check
 2014-11-03 17:44:29 -08:00
tkdrg
56c3f61e35 Merge remote-tracking branch 'upstream/master' into upboat 
Conflicts:
	code/__HELPERS/_logging.dm
 2014-11-03 22:38:21 -03: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
d81eb696c4 Merge pull request #5570 from xxalpha/noslipfloor 
High-traction Floor
 2014-11-03 17:37:20 -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
bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13 
Constructable conveyor belts!
 2014-11-03 17:33:32 -08:00
hornygranny
abc9fb947b Merge pull request #5622 from phil235/MechaProtocolFix 
Mech maintenance protocol fix
 2014-11-03 17:28:32 -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
c1b7d33bc6 Merge pull request #5496 from phil235/BookBinderFix1 
Busy book binder cannot start a new print job
 2014-11-03 17:24:02 -08:00
hornygranny
2b8045ebe0 Merge pull request #5494 from phil235/BiogenFullFix1 
Biogenerator container fix
 2014-11-03 17:23:41 -08:00
hornygranny
bd0b4a39af Merge pull request #5558 from JJRcop/whoa_obj-screen-click_is_really_bad 
Turns /obj/screen/Click() into subtypes
 2014-11-03 17:20:45 -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
b32e9cff12 Merge pull request #5621 from tkdrg/damnoldcoders 
Moves around some vars
 2014-11-03 17:15:54 -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
f73cc93ccd Merge pull request #5592 from wiox/P2 
adjustmask() now uses visor_flags and visor_flags_inv
 2014-11-03 17:14:07 -08:00
hornygranny
fa4fa09149 Merge pull request #5569 from Menshin/runtimes_roundsup 
Alek2ander weekly runtimes fixing
 2014-11-03 17:13:18 -08:00
hornygranny
fa8fcbba00 Merge pull request #5535 from Perakp/onlyOne 
Highlander fix
 2014-11-03 17:12:26 -08:00
hornygranny
6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
hornygranny
0a0cd991de Merge pull request #5516 from paprka/telestunfix 
fixes telebaton stunning borgs
 2014-11-03 17:11:39 -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
hornygranny
c794bdf797 Merge pull request #5432 from tkdrg/outoftheleftfield 
Contaiment fields will now bounce off structures, machinery and mechs
 2014-11-03 17:07:34 -08:00
tkdrg
d3727e6e3e Removes unused code instead of commenting it out 2014-11-03 18:25:05 -03: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
Hornygranny
4cfa4ec04b windows break at stage 5 2014-11-03 11:37:08 -08: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
JJRcop
3318f50cd2 Fixes path typo 2014-11-03 12:21:57 -05:00
Cheridan
2fefe79c1f Merge pull request #5599 from phil235/CharScreenWindowFix 
Fix the character setup window's size
 2014-11-03 10:39:32 -06:00
Cheridan
5d7993eb75 Merge pull request #5602 from tkdrg/ihavenohandstopullyouwith 
Slimes can no longer pull
 2014-11-03 10:19:27 -06:00
Cheridan
3239c6dbfc Merge pull request #5283 from TZK13/Syndicate-Encryption-Key 
Adds a Syndicate encryption key to uplinks
 2014-11-03 10:02:28 -06:00