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

2186 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
hornygranny
402d5a368b Merge pull request #5997 from tkdrg/guyspls 
Fixes HTML injection exploit with blueprints
 2014-11-24 13:18:11 -08:00
Razharas
717fb78278 Merge pull request #5994 from phil235/RadLaserAnimFix 
Traitor health analyzer stops doing attack animation and hitsound
 2014-11-23 23:41:46 +03: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
tkdrg
2b5c67fb36 Fixes blueprint HTML injection exploit 2014-11-22 14:32:10 -03:00
phil235
d6c2cb4df5 Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff. 2014-11-22 17:36:02 +01:00
hornygranny
dce9dadea2 Merge pull request #5914 from paprka/removewindows 
Changes most border windows/firelocks to full tile
Gets paprika killed
 2014-11-21 11:47:04 -08: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
448d0fab7f Merge pull request #5913 from tkdrg/yearslater 
Makes cyborg modules NODROP
 2014-11-21 10:17:53 -06:00
Cheridan
a9199118e5 Merge pull request #5925 from paprka/flashfix 
Fixes flashes being useless
 2014-11-21 10:14:39 -06:00
paprka
41c86dd557 fixes disarming affecting area stuns 2014-11-21 08:06:07 -08: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
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix 
Atmos z level fix + radio controller code sanitization
 2014-11-18 17:05:14 -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
Remie Richards
85f735c504 Merge pull request #5878 from phil235/DroneShardFix 
Fixes drones cutting their hands when using shards.
 2014-11-17 09:55:19 +00:00
paprka
12ec40d246 buffs defibrillator PNR to 5 minutes 2014-11-16 21:22:05 -08:00
paprka
fd910387c3 windows damage and such 2014-11-16 17:13:33 -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
paprka
649be7cf8a Fixes flashes being useless 2014-11-16 14:39:50 -08:00
tkdrg
0f28c013ff Makes cyborg modules NODROP 2014-11-16 15:59:57 -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
hornygranny
ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors 
Floor refactor MkII
 2014-11-15 20:13:50 -08: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
tkdrg
77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm
 2014-11-14 15:23:35 -03: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
Menshin
ec944abfc6 * limit atmos/fire alerts to the current z_level 
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
 2014-11-14 10:10:45 +01:00
phil235
e2a213879f Fixes the flashbang runtime. 2014-11-13 18:31:42 +01:00
phil235
2340caa309 Fixes drones cutting their hands when using shards. 2014-11-13 17:54:41 +01:00
phil235
a248a1a4db Conflicts: 
icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-11-13 17:33:32 +01:00
tkdrg
ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel 
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
 2014-11-12 22:50:32 -03: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
Swag McYolosteinen
7ce90ff54a Merge pull request #5654 from GunHog/Potato_AI_Wants_To_Hear_You_Scream_Too 
Gives Traitor AIs the Syndicate Channel!
 2014-11-10 17:18:04 +01: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