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
32,617 Commits 61 Branches 14 Tags
2eaab2c39e554e73f27e5d672126591cbeb0da25
Commit Graph

636 Commits

Author SHA1 Message Date
GunHog
6725a2e682 Membrane change, dropper nerf 
- Droppers now only work on human mobs
- Resin membranes now block lasers.
 2016-04-07 18:04:12 -05:00
GunHog
afbe7c0dcc Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-06 14:10:07 -05:00
MrStonedOne
5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
Cheridan
90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
Cheridan
591aacfcc5 Merge pull request #16527 from ChangelingRain/thisiskorsfault 
Fixes minerals not spreading
 2016-04-04 18:20:21 -05:00
Cheridan
d5a0f12ae3 Merge pull request #16438 from Bawhoppen/imrunningoutofnamesforbranches 
A few new maint lootspawner additions
 2016-04-04 18:02:57 -05:00
GunHog
c33af31bf6 Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-04 11:56:07 -05:00
Nerd Lord
d5a9fc1319 IT IS DONE 2016-04-04 10:31:13 -04:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
Nerd Lord
7d5dce7e10 this, on the other hand, is byond's fault 2016-04-01 20:10:07 -04: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
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
GunHog
36aedd1da2 Phase 1 
- Adds skeleton code for airlock forcing
- Buffs Drone health
- Reduces alium growth times
- Buffs alien window health
 2016-03-29 12:44:22 -05:00
bawhoppen
7a109c5fd0 neutrality preserved 2016-03-27 23:46:49 -05:00
Lularian
275b3dcc96 lootspawner additions 2016-03-27 23:37:45 -05:00
AndrewJacksonThe2nd
40e766c6d0 AAAAAAAAAAAAAAAAA 2016-03-27 12:04:33 -07:00
KorPhaeron
095bede7ed Merge pull request #16334 from ChangelingRain/parasitic 
Adds assassin holoparasites
 2016-03-25 19:24:28 -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
AnturK
6a00b7eebb Merge pull request #16303 from ChangelingRain/weedsmoothing 
Removes a line that broke weed smoothing on destruction
 2016-03-24 17:31:14 +01:00
Nerd Lord
5dea8ebca1 Adds assassin holoparasites 
Assassin holoparasites can go invisible, causing their next attack to do massive damage and ignore armor.
The stealth will be broken by attacking or taking damage.
 2016-03-24 12:08:09 -04:00
duncathan salt
63aa7358f4 Merge pull request #16291 from ChangelingRain/holobuff 
Buffs lightning holoparasite to not be total shit
 2016-03-23 21:13:17 -06:00
Nerd Lord
4ab87e60cf tis all 2016-03-23 16:38:04 -04:00
Nerd Lord
e2b63da3a6 generic typepath! 2016-03-23 16:21:30 -04:00
Nerd Lord
0d57726740 Removes a line that broke weed smoothing on destruction 2016-03-23 11:13:07 -04:00
Nerd Lord
905a72069b Buffs lightning holoparasite to not be total shit 
Adds two new, admin-only guardian types
 2016-03-22 16:07:37 -04:00
Nerd Lord
eabdb0966d actually fuck it I'll randomize them myself 2016-03-21 21:43:30 -04:00
Nerd Lord
9b9f822b87 kills weed edging code with a hatchet 
invites wj to kill me because the weed icons aren't random anymore and you'd need like three DMIs to achieve randomness
 2016-03-21 21:11:03 -04:00
Cheridan
c6ab8b0041 Merge pull request #16165 from ChangelingRain/cultlock 
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
 2016-03-19 21:58:12 -05:00
Nerd Lord
f7a2348ef7 Nar-Sie will now corrupt doors, tables, windows, and windoors 2016-03-17 16:28:26 -04:00
MrStonedOne
09fb8c2b10 Explosions and singulo use spiral range (and other changes) 2016-03-15 03:39:41 -07:00
duncathan
12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.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/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
 2016-03-10 23:07:21 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
c0
240fd5bc05 Plant Refactor: Genesis 2016-03-09 09:29:37 +03:00
Impisi
2bb60c13a3 Fixes loottable 2016-03-05 05:31:02 -08:00
Impisi
9eda2e0932 Reduces empty lootdrop slots to rebalance the table according the the original creators instructions. 2016-03-05 05:22:07 -08:00
tkdrg
a0397a73a7 Merge pull request #15698 from LanCartwright/flyvomit 
Flypeople now eat vomit
 2016-03-01 21:30:15 -03:00
Akke
fc88b4d589 changes destroy() to qdel(src) 2016-03-02 00:00:54 +00:00
Impisi
1aadc83f28 I added Modular Receivers with a rarity value of 1 to the loot table for maintenance loot spawning. 2016-02-29 02:31:26 -08:00
Akke
72854bd973 Flies can no longer eat. 
Flies must eat vomit.
Eating causes vomiting.
Janitors and Janitorborgs rollout.
 2016-02-23 00:03:15 +00:00
phil235
2ec892a1fc Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier 
Conflicts:
	icons/effects/effects.dmi
 2016-02-22 01:34:20 +01:00
tkdrg
f81e52c164 Merge pull request #15605 from phil235/StreamSpray 
Spray bottles now have a "stream" mode toggled by clicking the bottle.
 2016-02-20 11:56:33 -03:00
tkdrg
78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh 
Added new event: portal storm.
 2016-02-19 21:08:16 -03:00
duncathan salt
6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob 
Blobbernauts and blob spores are now immune to blob chemicals
 2016-02-19 15:51:41 -06:00
Nerd Lord
37eee7c302 keep the heal effect within the tile okay 2016-02-19 14:02:53 -05:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
phil235
8b2708ff9a Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator). 2016-02-19 02:34:57 +01:00
Nerd Lord
59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob. 
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
 2016-02-18 17:11:59 -05:00