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

2177 Commits

Author SHA1 Message Date
fleure
e8ca9ec224 Fixes multiple airlocks on same tile 2014-11-23 16:32:24 +00:00
Swag McYolosteinen
002ecddba3 Merge pull request #5849 from phil235/SoapMsgFix 
Fixes the mouth washing message
 2014-11-22 19:08:55 +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
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
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
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
GunHog
4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too 
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
 2014-11-09 12:27:48 -06: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
hornygranny
4ff8507c85 Merge pull request #5727 from phil235/RecorderFix 
Fixes the tape recorder. (one typo)
 2014-11-08 15:07:47 -08:00