cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-10 08:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,349 Commits 60 Branches 14 Tags
f743754ec3ef446c8172388431effa73aeddb7ff
Commit Graph

565 Commits

Author SHA1 Message Date
KorPhaeron
f743754ec3 Survival Pod 2016-04-06 15:36:53 -05:00
KorPhaeron
5e416d2188 Merge pull request #16661 from ChangelingRain/fixkorsshit2k16 
Fixes minerals showing up weird with mining scanners
 2016-04-06 10:57:31 -05:00
KorPhaeron
55ca4d89ca Merge pull request #16641 from ChangelingRain/coolitoff 
Simple Animal ranged cooldowns now use world.time
 2016-04-05 18:45:48 -05:00
KorPhaeron
511f65200d Shorter ash storms 
* Shorter ash storms
 2016-04-05 20:05:12 +02:00
KorPhaeron
91255b25e2 Merge pull request #16623 from TechnoAlchemisto/explore_this_fam_unzips_pickaxe 
Lets pickaxes be held in explorer suits.
 2016-04-05 11:11:51 -05:00
Nerd Lord
0741e4876b Fixes minerals showing up weird with mining scanners 2016-04-05 12:03:13 -04:00
Cheridan
663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
Nerd Lord
8038c4dd33 Simple Animal ranged cooldowns now use world.time 
this might fuck stuff up but ~oh well~
 2016-04-04 19:59:59 -04:00
Nerd Lord
d5a9fc1319 IT IS DONE 2016-04-04 10:31:13 -04:00
KorPhaeron
0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05:00
TechnoAlchemist
1d96a76eba Lets picks be held in explorer suits. 2016-04-04 01:41:14 -07:00
duncathan
7751f41d25 fixes compilation warnings; speeds up roundstart init a bit 2016-04-03 22:59:28 -06:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
KorPhaeron
c93abbb0b9 Adds Techno's absinthe to mining 
* Absinthe

* Formatting
 2016-04-02 23:48:24 -04:00
Isratosh
fa122fe793 Adding admin logs to bluespace shelter capsules. 
* Adding admin logs to bluespace shelter capsules.

* Only logs when not on mining or lavaland z level
 2016-04-02 02:42:18 -06:00
Nerd Lord
7d5dce7e10 this, on the other hand, is byond's fault 2016-04-01 20:10:07 -04:00
KorPhaeron
2be10e302f Uses temp overlays for material scanners 2016-03-31 17:15:06 -05:00
KorPhaeron
f2d5345093 Mesons 2016-03-31 17:02:50 -05:00
Nerd Lord
36b5b91c04 Fixes minerals not spreading 2016-03-31 15:17:18 -04:00
KorPhaeron
55434a673d Heavy Weapon Fix 2016-03-31 12:23:46 -05:00
KorPhaeron
a74b7c209c Mining Drone Upgrades 2016-03-31 03:41:03 -05:00
duncathan
eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
 2016-03-30 22:55:00 -06:00
KorPhaeron
721ef94443 Fixes icons for real 2016-03-30 17:51:28 -05:00
KorPhaeron
9711586a70 Icon Fix 2016-03-30 17:31:40 -05:00
KorPhaeron
b388e76f9c Knives and thermal protection 2016-03-30 13:28:38 -05:00
KorPhaeron
e3dcebc65e Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2 
# Conflicts:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2016-03-30 02:12:20 -05:00
KorPhaeron
d987bc0aad Temperature resist 2016-03-30 01:43:50 -05:00
KorPhaeron
ca5b67e119 Explorer Gear 2016-03-30 01:27:22 -05:00
duncathan salt
5ff2020202 Merge pull request #16357 from Iamgoofball/fast 
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
 2016-03-29 20:06:55 -06:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
 2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
KorPhaeron
53fac5b31d Ruins mining 2016-03-29 03:09:59 -05:00
KorPhaeron
e073c49bbd Scanner 2016-03-28 23:47:23 -05:00
KorPhaeron
e829213938 Mining Balance 2016-03-28 06:30:26 -05:00
KorPhaeron
d978fc61a1 Mecha 2016-03-27 23:47:17 -05:00
Cheridan
20fb01cda2 Merge pull request #16265 from Iamgoofball/boss_of_this_lavaland 
hey spaceman i think you got the wrong vault
 2016-03-27 12:30:41 -05:00
Cheridan
a83d8ebe16 Merge pull request #16388 from KorPhaeron/chasm 
Fixes chasm showing invisible things dropping
 2016-03-27 12:25:47 -05:00
Cheridan
865b744478 Merge pull request #16387 from KorPhaeron/capsuleagainandagain 
[s]CAPSULE FIX AGAIN
 2016-03-27 11:36:58 -05:00
AndrewJacksonThe2nd
f0d2661829 fuq 2016-03-26 16:57:25 -07:00
AndrewJacksonThe2nd
0849c33f83 cheridan 2016-03-26 16:45:59 -07:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
KorPhaeron
a612b73d9e Chasm Fix 2016-03-26 04:23:11 -05:00
KorPhaeron
ffb0aa5655 AND AGAIN 2016-03-26 04:01:40 -05:00
AndrewJacksonThe2nd
f54132e74b Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem 2016-03-25 03:56:01 -07:00
duncathan salt
fd36e4c090 Merge pull request #16257 from PKPenguin321/shshashaaa 
gives sand a new function
 2016-03-23 11:38:50 -06:00
KorPhaeron
9862f9b8d4 Layers 2016-03-21 17:08:14 -05:00
KorPhaeron
cfe7af21e7 Mine turf cleanup 2016-03-21 15:55:31 -05:00
AndrewJacksonThe2nd
4fd7ad35ec fuck you zombiehead 2016-03-21 02:34:01 -07:00
KorPhaeron
c95e64c17e Makes mine turfs less garbage 2016-03-21 03:00:51 -05:00