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

604 Commits

Author SHA1 Message Date
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
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
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
Perakp
2cf129759b Showers wet the floor. 2014-09-07 00:11:04 +03:00
Firecage
ea900fc0e7 Phase 1 part 2: Improvement to code 2014-09-06 22:46:44 +02:00
Firecage
2bf0773261 First phase of statues part 1 2014-09-06 21:14:27 +02:00
ikarrus
93d7aa68c2 Consistent welding sounds 
Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg

Closets and airlocks were backwards.
 2014-09-06 10:06:17 -06:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Cheridan
fa51c73548 Adds logging, fixes typo 2014-09-04 00:42:06 -05:00
Cheridan
f8399e07ba Spirit Boards! 2014-08-31 23:58:06 -05:00
Alex
c788df4d6e Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish 
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
 2014-08-31 12:34:34 +01:00
Alex
ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints 
Shower logging and prints
 2014-08-31 12:32:31 +01:00
Hornygranny
2d3756f509 nest pixel_x adjusted 2014-08-29 10:13:37 -07:00
Joonatan O'Rourke
492a043f47 fixed reinforced tables 
Fixes not being able to place wrenches on (unweakened) reinforced
tables. The return statement in the conditional for the wrench in
attackby was preventing control from reaching the conditional later on
that places the wrench on the table. The conditional for the wrench now
checks if it can destroy the table, and if not it continues down to
where it is then placed on the table. table_destroy is now guaranteed to
destroy the table. Also removed the now redundant check in table_destroy
and made it more portable between different kinds of tables. Also fixed
an obvious typo.
 2014-08-28 20:02:55 +03:00