cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,578 Commits 61 Branches 14 Tags
6786cd73f47d8a2bdbaebeada06ba24469c71cd7
Commit Graph

1429 Commits

Author SHA1 Message Date
hornygranny
a24eeb7f93 Merge pull request #5758 from phil235/TorchFix 
Fixes the torch and flare icons.
 2014-11-24 15:18:08 -08:00
hornygranny
6030fc88c4 Merge pull request #5926 from tkdrg/plasmagrenadeopplsnerf 
Fixes chem grenade phasing through windows/windoors
 2014-11-24 13:19:21 -08:00
Swag McYolosteinen
002ecddba3 Merge pull request #5849 from phil235/SoapMsgFix 
Fixes the mouth washing message
 2014-11-22 19:08:55 +01:00
phil235
0bc84e120e Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix 
Conflicts:
	icons/mob/items_lefthand.dmi

Adding PR 5829 to my PR so both can be merged now.
 2014-11-22 18:56:31 +01:00
Cheridan
7feaa1cf66 Merge pull request #5934 from paprka/defibbuff 
Buffs defibrillator PNR to 5 minutes
 2014-11-21 10:30:38 -06:00
Cheridan
0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76 
Magic Mania 1.76: Lets outrun the feature freeze
 2014-11-20 09:07:41 -06:00
Razharas
e205c8f2f6 Merge pull request #5857 from paprka/lolnames 
Fixes a bunch of capitalization inconsistencies, adds names to vendors
 2014-11-18 03:46:26 +03:00
hornygranny
639594c7f9 Merge pull request #5890 from Jordie0608/iwhoopsedalloverit 
Fixes #5840 Improves stun baton messages
 2014-11-17 11:46:06 -08:00
paprka
12ec40d246 buffs defibrillator PNR to 5 minutes 2014-11-16 21:22:05 -08:00
tkdrg
fd0387c151 Fixes chem grenade phasing through windows/windoors. Changes chem grenade reactions to be slightly more realistic, volume-wise. 2014-11-16 21:23:56 -03:00
Razharas
54299ac9b4 Merge pull request #5812 from fleure/nozfix 
Fixes nozzle deleting and adds some safety to nozzle toggling
 2014-11-16 13:44:42 +03:00
Incoming
fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Razharas
4f81da5bdf Merge pull request #5797 from Steelpoint/BeltFix 
Fix: SecBelts can hold Tear Gas Grenades
 2014-11-15 01:03:46 +03:00
Razharas
a4d0cfeba5 Merge pull request #5880 from phil235/FlashbangRuntimeFix 
Fixes the flashbang runtime.
 2014-11-14 22:38:00 +03:00
Jordie0608
e771e8f91e improves stun messages 2014-11-15 05:48:47 +11:00
Remie Richards
da8acb2ded Merge pull request #5845 from phil235/StunBatonAtckAnimFix 
Fixes the lack of attack animation when using the stun baton a certain way
 2014-11-14 18:17:37 +00:00
Remie Richards
17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes 
Throwing bugfixes
 2014-11-14 18:04:00 +00:00
phil235
e2a213879f Fixes the flashbang runtime. 2014-11-13 18:31:42 +01:00
phil235
a248a1a4db Conflicts: 
icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-11-13 17:33:32 +01:00
paprka
fe94f9cab0 Fixes a bunch of capitalization inconsistencies, adds names to vendors 2014-11-12 15:37:21 -08:00
phil235
65ba4f9764 Fixes the mouth washing message and the cleaning message appearing at the same time. 
Lets monkeys wash a human's mouth.
 2014-11-12 17:37:27 +01:00
phil235
b0d5e1b836 Fixes the lack of attack animation when using the stun baton on "on" and with intent other than harm. 2014-11-12 15:22:06 +01:00
hornygranny
f00d32abc1 Merge pull request #5803 from Menshin/sleeping_in_closets 
Removes hilarious but useless sleep() in closets/boxes creation
 2014-11-11 10:55:07 -08:00
fleure
613b450ac7 Better equip code 2014-11-10 19:25:58 +00:00
fleure
0b0dba724a Added better nozzle deletion and removed qdel check 2014-11-10 19:09:34 +00:00
fleure
ad27bc5200 Added GC check 2014-11-10 18:48:48 +00:00
fleure
c0d858dccf Fixes nozzle deleting and adds some safety to nozzle toggling 2014-11-10 17:48:37 +00:00
hornygranny
fa735ea9ed Merge pull request #5768 from paprka/mophands 
Fixes no inhand for advanced mop
 2014-11-10 08:16:22 -08:00
Swag McYolosteinen
9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting 
Firefighting changes
 2014-11-10 16:55:38 +01:00
Menshin
cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01:00
paprka
0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm
 2014-11-09 14:53:19 -08:00
Ergovisavi
481a282ca8 Adds NODROP to the Atmos watertank nozzle. I have no regrets. 2014-11-09 13:56:12 -08:00
Ergovisavi
2c74fc8dbb -Adds secure atmos closets to Atmos 
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
 2014-11-09 11:16:58 -08:00
Steelpoint
e02e2f5c0b TearGas 2014-11-10 02:16:46 +08:00
MrPerson
c159878ace Throwing bugfixes 
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().

Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823

Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
 2014-11-09 00:29:20 -08:00
paprka
9be60df479 fixes no inhand for mop 2014-11-08 19:28:13 -08:00
hornygranny
62003a8ab8 Merge pull request #5700 from RemieRichards/SiliconLawCap 
Adds a config option to cap silicon laws. [NEW CONFIG OPTION]
 2014-11-08 15:22:09 -08:00
Ergovisavi
9c1366d65f Adds a new define for temperature protection for more robust firefighting gear 
Adds Atmos Firesuits, Atmos Firesuit Helmets, sprites for all the firefighting gear etc
 2014-11-08 02:14:37 -08:00
Cheridan
15b16e1f67 Merge pull request #5726 from paprka/traitorbeltthing 
Adds disguised med analyzer to medibelts
 2014-11-07 23:39:56 -06:00
hornygranny
efb3877fcf Merge pull request #5682 from paprka/fixdefib 
Defibrillator Hotfixes
 2014-11-07 19:49:04 -08:00
paprka
7bde69c3a7 emagged defibs now make people gasp 2014-11-07 16:17:58 -08:00
paprka
774e82de06 Buffed weaken of safety off defibs and removed burn damage 2014-11-07 16:17:11 -08:00
Cheridan
594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization 
Text input sanitization (take 1)
 2014-11-07 13:56:20 -06:00
Cheridan
e2bf3eca4b Merge pull request #5705 from Donkie/batonfix 
Fixes #5691 - Batons incorrectly giving messages
 2014-11-07 10:27:09 -06:00
Cheridan
3f16a966b2 Merge pull request #5712 from xxalpha/amilli 
Increases gold content per Robust Gold cigarette to 1
 2014-11-07 10:09:54 -06:00
paprka
e5db75d756 adds disguised med analyzer to medibelts 2014-11-06 21:36:54 -08:00
xxalpha
e1a06faa9b Increases gold content per Robust Gold cigarette to 1 2014-11-06 18:23:48 +00:00
paprka
b99499e277 fixes utility medipen bundle for miners 2014-11-05 18:02:14 -08:00
Daniel
059244387f Fixed #5691 2014-11-06 01:12:15 +01:00
Remie Richards
d1e0ef943c Changes messages to be more appropriate for last commit + more fluffy. 2014-11-05 23:31:51 +00:00