cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,100 Commits 61 Branches 14 Tags
f5eb963720beb0480da88eecc4ae67cdc003ae9c
Commit Graph

615 Commits

Author SHA1 Message Date
Cheridan
fb7aff426d Merge pull request #5039 from paprka/hatstation13 
Some job-specific hat rebalancing
 2014-10-04 20:51:08 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
paprka
822613d698 remove helmet pathing 2014-10-01 15:01:36 -07:00
paprka
a499710081 hat rebalancing 2014-09-30 13:08:13 -07:00
Swag McYolosteinen
d9ee81bb96 Merge pull request #4815 from phil235/AudibleMsgFix 
Simplifying audible messages
 2014-09-27 15:01:56 +02:00
phil235
1840d72ae4 reverting to show_message proc in three places. 2014-09-25 19:14:51 +02:00
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-09-25 18:45:53 +02:00
phil235
7afbd3345b Replacing some hearers(...) with get_hearers_in_view(...). 
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
 2014-09-25 18:22:27 +02:00
ikarrus
796e540dfc Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-09-25 09:37:54 -06:00
Cheridan
02d3cdc199 Merge pull request #4938 from hornygranny/tableclimbing 
table bugfixes
 2014-09-24 19:09:26 -05:00
Hornygranny
24edf9f6d4 Fixes #4933 by refactoring climbing (ty MrPerson) 2014-09-24 12:31:24 -07:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire 
Repaths clown ore to bananium
 2014-09-24 16:58:23 +02:00
Hornygranny
8aa5fd2ff6 ishuman changed to istype for previously defined scope 2014-09-23 10:43:26 -07:00
Hornygranny
4176e6d106 only humans can climb 2014-09-21 21:58:30 -07:00
ikarrus
c4efa0f773 Downgraded ammunition locker to a regular closet 
The armory doesn't need two secure lockers, and certainly not one just to hold beanbag shells.
 2014-09-21 22:02:35 -06:00
Cheridan
4616ca7c63 Merge pull request #4764 from hornygranny/tableclimbing 
humans can climb onto tables
 2014-09-20 16:58:20 -05:00
Hornygranny
7f059a82fa changed stun to Stun() :^) 2014-09-19 22:31:54 -07:00
Hornygranny
1b9eddc2e4 climbing a table stuns you 2014-09-19 13:32:44 -07:00
Remie Richards
6dde12b8ed Merge pull request #4838 from Jordie0608/breakingrillesisagreatwaytoruinabarbeque 
Updates grille damages Fixes #796
 2014-09-19 18:46:14 +01:00
Remie Richards
9458d30d3a Merge pull request #4718 from Perakp/wetShower 
Showers wet the floor
 2014-09-19 16:28:04 +01:00
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Jordie0608
cbdf479b5d hitsound uses burn else instead of checking brute 2014-09-18 20:05:46 +10:00
Jordie0608
d53e8f6a52 Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque 
Conflicts:
	code/game/objects/structures/grille.dm
 2014-09-18 19:16:28 +10:00
Cheridan
dff5ed3683 Merge branch 'master' of https://github.com/tgstation/-tg-station into quija 
Conflicts:
	tgstation.dme
 2014-09-17 18:24:08 -05:00
Cheridan
40e40af5af Merge pull request #4845 from Menshin/table_crafting_fix 
Items table crafting fixing
 2014-09-17 13:53:13 -05:00
Cheridan
fabc50fa40 Merge pull request #4857 from Donkie/echair 
Removes e-chair toggle verb. Fixes #4853
 2014-09-17 10:33:48 -05:00
Cheridan
83390797cb Merge pull request #4844 from phil235/TypoFix 
Fixing typos.!
 2014-09-17 10:13:21 -05:00
Hornygranny
adbb99a818 make prok gud 2014-09-16 11:33:57 -07:00
Cheridan
98ca6f551a Merge pull request #4715 from Firecage/STATUESGALORRE 
Mineral Statues!
 2014-09-16 08:56:40 -05:00
Cheridan
cd990bdeda Merge pull request #4810 from phil235/Messagetypos 
Fix many messages and sounds
 2014-09-16 08:45:31 -05:00
Daniel
5da8979229 Removed on variable and toggle verb 
they be useless
 2014-09-16 12:11:42 +02:00
Daniel
c4c4bdf833 Ghosts can't interact with echairs. Fixes #4853 2014-09-16 12:02:59 +02:00
Jordie0608
6e9eed33f7 Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque 2014-09-16 12:50:12 +10:00
phil235
8672e58e3a Fixing typos. 2014-09-15 19:50:34 +02:00
Menshin
d519501425 * prevent the same item from being selected multiple times when looking for parts while table crafting (fixes #4820) 
* small typo in construction fixed
 2014-09-15 19:20:47 +02:00
Firecage
caa4d60503 Phase Honk 2014-09-15 12:44:52 +02:00
Jordie
73c5ef4459 == > != 2014-09-15 20:37:21 +10:00
Jordie
26a7aa1ec3 Updates grille damages 2014-09-15 20:12:14 +10:00
Firecage
16502db223 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE 2014-09-15 11:17:44 +02:00
Firecage
ad5d15a225 New part 2014-09-15 11:16:39 +02:00
phil235
87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)" 
fixing typos and missing emotes in emote lists.
 2014-09-14 01:15:15 +02:00
phil235
24686b5248 Fixes many messages/sounds or lack thereof for different mobs. 
(

Nothing when Attack w/ item on dead animal
No varied attack verb for the above.
Item attack on alive SA/syndicate/melee: no sound
No Punchsound on alive and dead SA.
goat attack on SA/human/alien/monkey : no sound
attack_hand and Item attack on dying mouse: nothing
is_muzzled() fix in slime.dm and humanoid.dm and larva.dm and humanattac?kpaw.dm (put a muzzle on self, immune to monkey bites!)
monkey attack on animal: can't attack alive!
monkey (821) has attacked the grey baby slime (477)! (needs bite and sound)
monkey can't attack_paw alien/slime/animal with health below 0.
attack_animal on larva has no sound.
monkey bite on human: no sound
Larva on Humanoid/slime.
can't monkeybite a wounded alien.
larva needs to be attackable by humanoid/slime/hand/item/monkey/SA
Monkey cant bite dead/unconscious monkey
Larva bite has no sound. can't bite anyone but animals

)
 2014-09-13 17:41:47 +02:00
phil235
d88cc00a2f Fixing some message and sound. 2014-09-13 00:46:57 +02:00
Aranclanos
6b574ce07c Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades. 2014-09-12 06:44:25 -03:00
Hornygranny
3f7fb4870e renamed proc 2014-09-09 15:51:00 -07:00
Hornygranny
92baf35204 muh whitespace 2014-09-09 15:35:48 -07:00
Hornygranny
8d898c5757 climbing onto tables 2014-09-09 15:32:35 -07:00
Hornygranny
02e527e938 Merge branch 'smoothaliens' 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
 2014-09-07 21:33:48 -07:00
Alex
8f81a0e766 Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff 
Removed unnecessary messages when welding
 2014-09-07 15:08:01 +01:00
Firecage
b3c842b614 phase 1 part 3: Anonussing 2014-09-07 00:40:48 +02:00