cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-08 23:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,753 Commits 63 Branches 14 Tags
789e5369dfaaa9f7e538e82edf473083dcb02016
Commit Graph

15596 Commits

Author SHA1 Message Date
Cheridan
789e5369df Merge pull request #17419 from phil235/Dismemberment 
Dismemberment
 2016-05-06 18:42:48 -05:00
phil235
53c5b7f5d5 Fixes lizard body markings appearing behind the bodypart layer. 
Fixes tail sprite when missing a leg and facing south.
Adds an admin option in human VV to remove a body part.
Fixes typos.
Fixes being able to toggle hardsuit and wintercoat helmet despite having no head.
Changes the dismemberment chance from explosion: bomb armor helps against it, and the maximum number of limbs that you can lose in one explosion is capped depending on the explosion severity.
Missing 1 or 2 legs makes you significantly slower. If without legs, missing an arm makes you slower. You can no longer move when missing all four limbs.
Bodyparts have now force 3 and throwforce 3
Tongues are now properly put in decapitated heads.
Shaking a legless person no longer gives weird results.
 2016-05-07 01:00:00 +02:00
phil235
1ef1117cb1 Fixes the healthdoll not being updated right away after an amputation. 2016-05-06 02:18:05 +02:00
phil235
c1e1fa03b2 fixes the healthdoll. 2016-05-06 01:05:09 +02:00
Robustin
b9e3e6ad34 Zombies airlock attack: Sound improvement (#17181) 
* Zombie airlock attack noise

* Delay between noises

* Noise delay tweak

* Kor fix

* PROXIMITY CHECK SO WE CAN HAVE DELAYED NOISE FOR IMMERSION

* Spawn change
 2016-05-06 00:58:54 +02:00
phil235
f8260e1d3d always gotta fail the merged conflict fixing. 2016-05-05 22:16:19 +02:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment 
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
 2016-05-05 21:57:10 +02:00
phil235
76a7fca8fe Some adjustments, following suggestions in the PR discussion. 2016-05-05 21:50:30 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
KazeEspada
e278111d04 Makes a really shitty lord of the rings reference 
THROW THE GREENTEXT INTO THE FIRE!
 2016-05-05 00:40:06 -05:00
Cheridan
0cb2103a84 Merge pull request #17358 from nullbear/crontroversial-fingerpointing-and-blame-pr 
makes pointing better.
 2016-05-04 17:00:12 -05:00
Cheridan
e588ff4a53 Merge pull request #17290 from bgobandit/casinevitablefix 
Fixes bugs with Cards Against Spess.
 2016-05-04 16:52:47 -05:00
Cheridan
86129d6841 Merge pull request #17334 from AnturK/fixpack1 
Fixes spider examine and lavaland generator.
 2016-05-04 16:51:02 -05:00
Cheridan
51466932c1 Merge pull request #17275 from Fox-McCloud/energy 
Makes Shock Revolver Use Energy Projectiles
 2016-05-04 15:16:39 -05:00
Cheridan
43c98210dd Merge pull request #17363 from ChangelingRain/notverysimple 
Gives all living mobs a medical hud display
 2016-05-04 14:52:13 -05:00
xxalpha
1b22679195 Fixes and buffs the banana shoes (#17305) 
shhh
 2016-05-04 12:25:23 -05:00
Aloraydrel
309dbe9786 Adds art supplies to cargo 2016-05-04 09:11:57 -05:00
Joan Lung
09b6caeb0e Merge pull request #17336 from coiax/coiax-fixes-things 
Glass tables break more, Metastation HoP hat fix
 2016-05-04 07:36:37 -04:00
Cheridan
3430bc9753 Merge pull request #17328 from TechnoAlchemisto/ARRPEE 
Adds new emotes, allows for CAPITAL LETTERS to work in emotes.
 2016-05-04 01:28:11 -05:00
TechnoAlchemist
528ce49e57 Adds dragon hide cloaks (#17322) 
* dragon scales and cloak stuff

* Finishes shit with the ash drakes and the cloak

* woopsie
 2016-05-04 00:43:31 -05:00
Cheridan
7909f8728d Merge pull request #17351 from KorPhaeron/dragon3 
Drake Fixes
 2016-05-03 22:52:34 -05:00
TechnoAlchemist
03731c294b Cheridan is my childhood role model 2016-05-03 20:52:19 -07:00
Joan Lung
6a927695e5 Merge pull request #17342 from Shadowlight213/Ahelprelay 
Adds cross server adminhelp relaying
 2016-05-03 22:46:18 -04:00
Shadowlight213
a3b4d118c4 Gives relays their own proc 2016-05-03 19:14:24 -07:00
Cheridan
6649e136d0 Lavaland Ruin update (#17348) 
* Lavaland Ruin update

* Make Beach Biodome Great
 2016-05-03 20:38:44 -05:00
Cheridan
75f404b326 Merge pull request #17337 from ChangelingRain/innatecomms 
Cult communication is now innate and has an action button
 2016-05-03 20:23:52 -05:00
Joan Lung
85d60e93f3 Merge pull request #17318 from coiax/we-can-hear-you 
Revenant and alien whispering heard by ghosts
 2016-05-03 17:16:28 -04:00
Nerd Lord
eea7ffb8c0 lockstep guardian hud 2016-05-03 16:27:40 -04:00
Nerd Lord
52ea8517c4 drones and swarmers get diag hud 2016-05-03 13:00:17 -04:00
KorPhaeron
6e10a6a839 Stronger Attack 2016-05-03 11:46:09 -05:00
Nerd Lord
3ab974494e Gives all living mobs a medical hud display 2016-05-03 12:13:43 -04:00
Aloraydrel
89ab88a7e1 Lab coats can carry emergency oxygen tanks (#17307) 
* Adds emergency tanks to labcoat.dm


* I have little idea what im doing but this should work

* Ok this is it

* Ree
 2016-05-03 12:55:48 +02:00
nullbear
ec7300f70e makes it impossible to join the server unless your ckey is prefixed with "im_a_cuck_" 2016-05-03 02:38:38 -07:00
KorPhaeron
d191efc751 Merge pull request #17329 from Cheridan/scavengers 
Ashwalker Den Update
 2016-05-03 03:01:50 -05:00
Jack Edge
72310cc63e More code review 2016-05-03 08:16:26 +01:00
Cheridan
e64783c1fa Merge pull request #17282 from coiax/brobot-is-an-artist 
Service and standard cyborgs get a spraycan; service cyborgs get a cyborg-hand labeler
 2016-05-03 01:55:01 -05:00
KorPhaeron
423ee67c73 Merge pull request #17330 from coiax/lavaproof-staff 
Staff of lava is now lavaproof
 2016-05-03 01:03:46 -05:00
KorPhaeron
11fa336dd9 Ghost sword fix 2016-05-03 00:10:39 -05:00
KorPhaeron
9775b8cdcc Dragon Fixes 2016-05-02 21:44:11 -05:00
Joan Lung
fe060eb1fa Merge pull request #17306 from coiax/fleshmend-diminishing-returns 
Fleshmend: Diminishing returns; Panacea: Better.
 2016-05-02 18:52:17 -04:00
Jack Edge
50fd90e25f Fixes compile errors 2016-05-02 23:20:12 +01:00
Jack Edge
c1e4c0163c Code review 2016-05-02 23:08:31 +01:00
Jack Edge
4ee3d491e7 Corrected incorrect description of booze 2016-05-02 22:23:36 +01:00
TechnoAlchemist
a43735baab s 2016-05-02 12:44:05 -07:00
Cheridan
d67922d626 Walker tendrils strip mobs before gibbing now 2016-05-02 14:38:41 -05:00
Shadowlight213
50372a586f Adds basic cross server message relay system. Currently setup to relay adminhelps to the other server in the case of no admins on a server. 2016-05-02 11:53:29 -07:00
AnturK
340b1d01ff Merge pull request #17314 from RemieRichards/mecha_pilot_fix 
Mecha and Mecha pilot fixes
 2016-05-02 20:25:44 +02:00
Joan Lung
faad4d5b71 Merge pull request #17293 from RemieRichards/clothing_variable_modding 
Allows clothing to alter variables on the wearer, Admin modifiable too!
 2016-05-02 12:21:23 -04:00
Remie Richards
bc754a7bfc Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot. 2016-05-02 17:18:34 +01:00
Nerd Lord
0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00