cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,971 Commits 61 Branches 14 Tags
3fca874ea3ea2026b9c08f784bc11fa715da660d
Commit Graph

1234 Commits

Author SHA1 Message Date
Cheridan
0f5fd59c0c Merge pull request #4919 from Miauw62/tatorbalance 
Rebalances traitor items.
 2014-09-27 17:13:50 -05: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
Swag McYolosteinen
78ce564314 Merge pull request #4871 from phil235/FlashPowderthing 
Fixes #4176
 2014-09-24 16:55:49 +02:00
Cheridan
ff5ec967eb Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives 
Standardizes name and path of plastique/plastic explosive/c4 to C4
 2014-09-23 09:02:43 -05:00
Miauw
619b7beede Syndie bundle adjustments. Made the emag one TC more expensive. 2014-09-22 18:37:27 +02:00
Miauw
899d967953 Doubles the amount of TC and the prices of uplink items. 
Stealthy items have been slightly decreased in price.
Weapons have been slightly increased in price.
Nuke items remain mostly unchanged.
 2014-09-21 15:56:24 +02:00
Jordie0608
facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
xxalpha
c1449e4827 Cigarette packs can now hold lighters. Now with thought and effort put into it! 2014-09-19 22:22:59 +01:00
xxalpha
a929c42d29 Cigarettes box capacity modified to hold rollies and lighers. 2014-09-18 00:26:43 +01:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones 
Ports Drones from NTstation + New Improvements/Features
 2014-09-17 16:56:40 -05:00
phil235
b756450d45 Fixes flash powder only checking for sunglasses protection. 
Simplify the flashbang prime() proc a bit.
 2014-09-17 22:48:02 +02:00
Cheridan
83390797cb Merge pull request #4844 from phil235/TypoFix 
Fixing typos.!
 2014-09-17 10:13:21 -05:00
Cheridan
de6edfc1c6 Merge pull request #4818 from Incoming5643/summoneventfixerspecial 
Magic Mania 1.75 Appendix A: lets get comparitively reasonable
 2014-09-16 09:09: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
Alex
9673532613 Merge pull request #4796 from Perakp/ghostbag 
Ghosts don't trigger mousetraps.
 2014-09-16 12:18:04 +01:00
Incoming
071f9bff0a Fixes up some silly problems with cursed items: 
Things won't be called cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed foo's anymore

Cursed Katanas can't get stuck in any other slots now

Things that destroy your ability to go into space now won't spawn on you at all if you happen to be in space when the spawning occurers, but hey don't idle in space just to avoid a luchador mask, magicarp are still a thing.
 2014-09-15 19:22:25 -04:00
phil235
8672e58e3a Fixing typos. 2014-09-15 19:50:34 +02:00
Perakp
f637e6491c Unconscious don't trigger mousetraps. 2014-09-14 20:49:36 +03:00
phil235
8d6ee69a36 Fixing issue where people can't hear their own emotes while inside lockers and the audible messages when also in the dark. Removing object_talk() proc (obsolete). 2014-09-14 16:17:16 +02:00
phil235
e639737605 hearers() -> get_hear() Fixing the issue. 2014-09-14 15:35:23 +02:00
phil235
4d427bf712 Partial fix for the immunity to flashbangs in the dark ( now only immune if in the dark AND inside a locker). Deaf people no longer see the "BANG" message of flashbangs. 2014-09-14 14:19:25 +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
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
phil235
d88cc00a2f Fixing some message and sound. 2014-09-13 00:46:57 +02:00
Perakp
2db366f4c1 Ghosts don't trigger mousetraps. 2014-09-12 15:21:32 +03:00
Cheridan
cd34be6151 Merge pull request #4521 from Incoming5643/summonevents 
Magic Mania $1.75: Summon events
 2014-09-07 22:34:26 -05: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
Alex
368b8b199b Merge pull request #4682 from Menshin/reagents_consumption_fix 
Fixes reagents extra consumption + some cleanup
 2014-09-06 19:05:42 +01:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Menshin
6c7ff25568 *fixes reagents consuming extra units each ticks (#4608) 
*removed the inexistent reagent/plasma subtype of hellwater
*hitting someone with unholy water in body with the bible now turns the unholy water in holy water instead of space cleaner
 2014-09-03 09:47:47 +02:00
Cheridan
da5b68e7ee stop asking how crowbars fit in your pocket fffff 2014-08-31 13:02:04 -05:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints 
Fingerprints for Cables and Tables
 2014-08-31 17:11:14 +01:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Alex
944966ba93 Merge pull request #4520 from Firecage/Messagefixes 
This fixes the message issues
 2014-08-24 12:59:52 +01:00
Cheridan
b33320e6b6 Merge pull request #4514 from Firecage/fix1 
Fix for 1 use freedom implant
 2014-08-22 09:52:34 -05:00
Cheridan
a7c0ca8dfd Merge pull request #4506 from Jordie0608/itsawondernanotrasendoesntreplaceweldingfuelwithsomethinglessvolatile 
Makes welderbombs use fueltank's ex_act
 2014-08-21 22:14:13 -05:00
Incoming
7ac7ecb277 Summon Events Initial Commit: See the pull for complete details 2014-08-21 20:05:41 -04:00
Firecage
4198e61af1 This fixes the message issues 2014-08-22 01:15:13 +02:00
Firecage
f5c3d0b9cf Fix for 1 use freedom implant 2014-08-21 16:11:26 +02:00
Jordie0608
f17200bc7f Makes welderbombs use fueltank's ex_act 2014-08-21 00:56:17 +10:00
MrPerson
09071b88d5 Merge pull request #4357 from paprka/nerfninja 
Makes ninja less stupidly broken (balancing)
 2014-08-16 04:13:49 -07:00
ikarrus
cb27ad34a6 Cutting cables, too 2014-08-15 19:50:09 -06:00
ikarrus
3fe03bbea7 Constructing Tables will add fingerprints 2014-08-15 19:40:04 -06:00
Alex
74c22755be Merge pull request #4365 from paprka/fingerlessgloves 
Adds fingerless gloves, other glove related changes
 2014-08-15 08:03:37 +01:00
Alex
ff25503b4d Merge pull request #4384 from Ikarrus/deputybands 
[MAP] Boxstation Update and Deputy Armbands
 2014-08-12 08:12:15 +01:00
paprka
e3c26bfdd1 Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore 
Conflicts:
	code/game/objects/items/weapons/storage/uplink_kits.dm
 2014-08-09 16:19:33 -07:00
ikarrus
8a5d1325d1 Update boxes.dm 2014-08-09 14:23:37 -06:00
ikarrus
22e0081cf3 Resolved Conflicts: 
code/game/objects/items/weapons/storage/boxes.dm
 2014-08-09 14:19:43 -06:00