cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,438 Commits 61 Branches 14 Tags
047de23ee0f97bf59ecc0a8564ed622f835948db
Commit Graph

3735 Commits

Author SHA1 Message Date
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
8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS 
HoS Beret + Warden Drill Hat
 2014-11-19 10:26:27 -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
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1 
All mechs get a melee attack
 2014-11-18 12:53:52 -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
Cheridan
53d913bc7f Merge pull request #5924 from tkdrg/junk 
Removes unticked unused code from the tree
 2014-11-17 13:34:49 -06: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
tkdrg
608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
Razharas
6fba9b3a19 Merge pull request #5688 from Jordie0608/isitpronouncedlockorloch 
Fixes #5613 null acid loc
 2014-11-16 20:22:08 +03:00
Steelpoint
03a98a6295 HoSBeret 2014-11-16 22:32:01 +08: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
509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08: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
hornygranny
b6d0531c34 Merge pull request #5865 from paprka/hornygrannysuxlmaoxdplsmerge 
Fixes a glass table related exploit
 2014-11-14 10:54:39 -08: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
b9f7496870 Merge pull request #5838 from tkdrg/lasertube 
Lasers can now go through transit tubes
 2014-11-14 18:21:50 +00:00
Remie Richards
890ad08d4b Merge pull request #5851 from phil235/ContainerBreakOutFix 
Resisting out of a closet no longer fails when locker is moved.
 2014-11-14 18:20:09 +00: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
Jordie0608
0fa48252c9 reworked acid's ticks and locationing 2014-11-15 05:15:30 +11:00
Remie Richards
85eaae7b4a Merge pull request #5877 from phil235/SmokeRuntimeFix 
Fixes the smoke runtime.
 2014-11-14 18:09:19 +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
paprka
ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
paprka
40cdf3ffec swat mask overhauls and such 2014-11-13 18:36:30 -08:00
Cheridan
24456bcc22 Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
 2014-11-13 18:55:53 -06:00
Cheridan
2f55abfa50 Merge pull request #5837 from paprka/infiniracks 
Fixes rack dupe exploit
 2014-11-13 17:19:26 -06:00
Cheridan
38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen 
Adds bee swarms and butterflies and diseases to create them
 2014-11-13 17:04:29 -06:00
phil235
d2d2d162ba Third time's the charm. 2014-11-13 19:39:37 +01:00
phil235
a73d22f2ed Actually fixes the runtime this time. 2014-11-13 19:22:22 +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
a005055cf3 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
 2014-11-13 17:17:23 +01:00
phil235
a2f23f2cef Fixes the smoke runtime. 2014-11-13 17:11:06 +01:00
paprka
85d879fbf4 Removes brute damage from tabling 2014-11-12 19:54:33 -08:00
paprka
020d28fe3b fixes a few glass table related bugs and adds more fun 2014-11-12 18:48:01 -08: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
1d2fac2162 Resisting out of a closet no longer fails when locker is moved. 2014-11-12 18:06:39 +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
tkdrg
6dfc9bbaac Lasers can now go through transit tubes 2014-11-11 21:46:36 -03:00
paprka
56316c6129 bad placement for this particular line 2014-11-11 16:37:47 -08:00
paprka
da5cd74d53 fixes rack dupe exploit 2014-11-11 16:31:50 -08: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
paprka
3fb5d14468 Merge branch 'master' of https://github.com/tgstation/-tg-station into EATITFATTY 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
 2014-11-10 11:43:46 -08:00
fleure
613b450ac7 Better equip code 2014-11-10 19:25:58 +00:00