cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-07 14:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,496 Commits 63 Branches 14 Tags
4e134df3fdcc028c855d81a5ac45afa43fb3a773
Commit Graph

3519 Commits

Author SHA1 Message Date
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit 
Added datum mutations
 2014-12-31 17:24:15 -03:00
phil235
286a9ce4bc Merge pull request #6657 from Lo6a4evskiy/Eyepatch_HUD_fix 
All sec HUDs work properly with examine buttons
 2014-12-31 15:45:40 +01:00
phil235
cfff3cd375 Merge pull request #6539 from Xhuis/pounce_nerf 
Nerfs alien hunter pounce
 2014-12-31 02:29:15 +01:00
tkdrg
ff173b82b1 Merge pull request #6656 from Ergovisavi/mushroom_samba 
Fixes mushrooms preying on non mushrooms
 2014-12-30 21:35:46 -03:00
Xhuis
1c88fbf615 Adds 3-second cooldown to alien hunter pounce; only triggers if successful 2014-12-30 18:19:35 -05:00
Razharas
d1f347f584 Fixes conflicts 
There werent even any conflicts really, but git for some reason thought
there are
 2014-12-30 15:12:09 +03:00
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
tkdrg
df2271c300 Merge pull request #6640 from Nyvrem/master 
Preferred colours for Podpeople
 2014-12-29 15:00:01 -03:00
Ergovisavi
f286d2602b Fixes mushrooms not being cannibals only 2014-12-29 07:28:30 -08:00
Lo6a4evskiy
9276e43e6e Fixes eyepatch and night vision HUDs not working with examine sec record buttons 2014-12-29 18:23:47 +04:00
Razharas
f7e6552e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-29 17:05:20 +03:00
tkdrg
80cc2d4100 Merge pull request #6622 from Thunder12345/grammarFixes 
Fixes for some grammer and formatting issues
 2014-12-29 10:20:35 -03:00
Thunder12345
d7dd967c34 Simplification 
Simplified nuzzling, never knew visible_message wound repeat the first
argument if there weren't any others.
 2014-12-29 11:35:48 +00:00
Razharas
10b21b20ab Conflicts resolution 
In items weapons melee misc
 2014-12-29 11:49:30 +03:00
Razharas
418e3a0613 General cleanup 
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
 2014-12-29 11:36:01 +03:00
tkdrg
ad2fee37be Merge pull request #6625 from phil235/HalluAttackAnimationFix 
Fixes hallucinated attackers not doing the attack animation.
 2014-12-29 01:56:19 -03:00
tkdrg
67b32194f1 Merge pull request #6612 from paprka/fixesstamdamprojguns 
Fixes stamina damage on projectile weapons
 2014-12-29 00:57:24 -03:00
Nyvrem
05a1cadac3 Preferred colours for podpeople 
Make podpeople use preferrence colours instead of being grey with black eyes.
 2014-12-28 18:39:20 +01:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
 2014-12-28 11:20:15 +03:00
Razharas
208b59c30e Fixed stuff tkdrg pointed out 
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
 2014-12-28 10:49:04 +03:00
tkdrg
60fc73d018 Merge pull request #6587 from phil235/MonkeyBiteMaskFix 
Fixes being able to bite as a monkey with your mouth covered by a mask.
 2014-12-28 01:01:14 -03:00
phil235
3994ac3f48 Fixes hallucinated attackers not doing the attack animation. 
Fixes lack of attack animation, sound and attack cooldown when the human mob attacks the hallucinated attacker.
Removes some commented code and some duplicated checks.
Reorganized the hallucination procs a bit.
 2014-12-27 22:41:13 +01:00
Thunder12345
744940c8a8 Fixes #6615 
All instances of "Your clothes feel warm" have been given a full stop.
Couldn't actually confirm in testing due to never getting the warm
clothes message, but I don't see why it wouldn't work.
 2014-12-27 18:32:45 +00:00
Thunder12345
d1efc0c002 Fixes #6548 
Simple animal friendly attacks (Ones that do no damage) now use the
notice span class, to match hugging.
 2014-12-27 17:27:55 +00:00
tkdrg
1846489593 Merge pull request #6589 from phil235/SiliconPunchMsgFix 
Fixes message typos
 2014-12-27 11:48:54 -03:00
Swag McYolosteinen
7ee2317ec3 Merge pull request #6207 from phil235/RecursiveHearVisibleMessage 
Mob inside something can now see visible_message()'s
 2014-12-27 13:20:50 +01:00
paprka
5dedde8ea2 fixes c90 and the stam dam update issue 2014-12-27 03:19:26 -08:00
paprka
33177a17ac fixes stamina damage on projectile weapons 2014-12-26 23:37:12 -08:00
Cheridan
cededeaa8e Merge pull request #6498 from as334/MobReactions 
Allows chemical reactions inside mobs
 2014-12-27 01:20:18 -06:00
tkdrg
fc7c7b520d Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser 
Blood-red hardsuit usability feature and syndicate loadout adjustments
 2014-12-27 02:59:24 -03:00
Remie Richards
82588d43bf Merge pull request #6347 from Xhuis/bzzzt 
Shocking animations
 2014-12-27 05:23:09 +00:00
Xhuis
9ba34b32e6 Fixes return() borking the code 2014-12-27 00:17:57 -05:00
tkdrg
8acded6304 Merge pull request #6278 from Ergovisavi/muh_mobs 
Mob faction cleanup / Some goliath changes / Hopefully fixing some lag
 2014-12-26 23:23:48 -03:00
Xhuis
f07b250dde Removes old comments and does damage immediately 2014-12-26 21:08:43 -05:00
tkdrg
188b85ae48 Merge pull request #5641 from MrPerson/autoghosting 
Moving while dead causes you to ghost
 2014-12-26 21:35:58 -03:00
paprka
615f3f3488 Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd 
Conflicts:
	code/modules/mob/living/damage_procs.dm
	code/modules/projectiles/projectile.dm
 2014-12-26 16:14:19 -08:00
Remie Richards
84649dacd4 Merge pull request #6339 from tkdrg/rip'd 
Ports the rapid pipe dispenser (RPD) from /vg/
 2014-12-26 23:58:17 +00:00
Cheridan
08d36580ba Merge pull request #6561 from paprka/manifestfixes 
Expands the new player options menu
 2014-12-26 13:22:24 -06:00
paprka
5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
 2014-12-26 09:09:24 -08:00
phil235
8a56892892 Fixes message typos in silicon punch message, mecha construction description, message when taking blood sample. 2014-12-26 12:13:54 +01:00
hornygranny
7445f27348 Merge pull request #6546 from Menshin/ian_place_hat_fix 
Fixes runtime when usrless placing an item on Ian's head
 2014-12-25 21:26:55 -08:00
hornygranny
dbaa0ca291 Merge pull request #6542 from phil235/SoreThroatFix 
Fixes getting sore throat messages while dead.
 2014-12-25 21:26:38 -08:00
tkdrg
a94012b98a Ports the rapid pipe dispenser (RPD) from /vg/ 
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.

Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
 2014-12-25 22:06:39 -03:00
Cheridan
5d2994eb35 Merge pull request #6526 from paprka/secondchef 
Adds second chef position / Renames chef to cook
 2014-12-25 15:30:00 -06:00
paprka
591b2f363b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-25 13:12:46 -08:00
paprka
389da595b8 expands the setup options menu 2014-12-25 11:32:47 -08:00
MrPerson
d8b85dda0a Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake 
refactors narsie
 2014-12-24 19:48:24 -08:00
paprka
7842ff8803 adds advanced tasers as default 2014-12-24 19:41:40 -08:00
MrPerson
748926a196 Merge pull request #6436 from paprka/sayshit 
Auto capitalization for most living mob messages
 2014-12-24 19:31:32 -08:00
paprka
1d1baa96bc Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-24 18:56:26 -08:00