cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-08 15:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,217 Commits 63 Branches 14 Tags
3f5efd3ca30c49f7c4d5939f3c233ebd9114792a
Commit Graph

6636 Commits

Author SHA1 Message Date
Cheridan
cf4ffc2781 Merge pull request #16026 from duncathan/turfs 
[REVIEW-READY] removes simulated turfs (and asteroid station)
 2016-04-04 01:49:45 -05:00
KorPhaeron
135ceb2b64 Buffs OOC ban 
* Buffs OOC ban

* Buffs OOC ban
 2016-04-03 22:39:52 -05: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
Cheridan
e1b7477857 Merge pull request #16579 from KorPhaeron/buffs_ignore 
Ignore Buffs
 2016-04-03 18:39:29 -05:00
KorPhaeron
69f9549a11 Ignore Buffs 2016-04-02 10:59:59 -05:00
Isratosh
75b350561a Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation 2016-04-01 01:32:59 -06:00
Joan Lung
82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22: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
duncathan salt
1d32467096 Merge pull request #16496 from ChangelingRain/edgecases 
Fixes edge case where it was possible to get multiple parasites without admin intervention
 2016-03-31 12:20:41 -06:00
KorPhaeron
40023cf843 Merge pull request #16495 from ChangelingRain/dazedzinnia 
Daisy and Zinnia holoparasites no longer try to kill your eyes
 2016-03-31 11:40:15 -05:00
duncathan salt
1ff5882696 Merge pull request #16473 from KorPhaeron/goliath_meat 
Goliath changes
 2016-03-31 00:35:13 -06:00
duncathan salt
3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery 
Slot icons micro-refactor
 2016-03-30 23:30:06 -06: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
507b48f8a3 Merge pull request #16476 from ChangelingRain/charrrrrrge 
Adds charger holoparasites to traitor
 2016-03-30 21:39:29 -05:00
Remie Richards
20597d0079 Merge pull request #16164 from Robustin/classiczombies 
Make zombies 2spooky
 2016-03-30 16:03:48 +01:00
Nerd Lord
323ccce61b Fixes edge case where it was possible to get multiple parasites without admin intervention 2016-03-30 10:08:29 -04:00
Nerd Lord
6db538ef77 Daisy and Zinnia holoparasites no longer try to kill your eyes 2016-03-30 10:00:22 -04:00
KorPhaeron
e6c52aa5b3 Merge pull request #16468 from PKPenguin321/patch-16 
Scales back grab nerf
 2016-03-30 02:27:59 -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
ca5b67e119 Explorer Gear 2016-03-30 01:27:22 -05: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
Nerd Lord
c5e1303bc1 confixed 2016-03-29 12:35:58 -04:00
Nerd Lord
166c2127dc only forces item dropping 2016-03-29 12:30:21 -04:00
Nerd Lord
da93492418 paper reeeee 2016-03-29 11:49:06 -04:00
Razharas
c1e992e60c Merge pull request #16429 from ChangelingRain/datumholoname 
Holoparasite Theme/Name Datums
 2016-03-29 18:22:37 +03:00
Nerd Lord
4407473896 Adds charger holoparasites to traitor 2016-03-29 10:58:37 -04:00
KorPhaeron
64a83e6871 Goliath Meat 2016-03-29 03:39:00 -05:00
KorPhaeron
53fac5b31d Ruins mining 2016-03-29 03:09:59 -05:00
PKPenguin321
8337562f41 applies changes to breakout probabilities 
how come my salt PRs dont get merged but goofballs do
aggro grab:
25 -> 75 -> 50
neckgrab:
5 -> 50 -> 15
 2016-03-28 22:17:21 -07:00
PKPenguin321
6c58930df5 scales back grab nerf 
original value -> goof value -> new value
grab upgrade timer:
40 -> 100 (>2x bigger than original) -> 60 (1.5x bigger)
killgrab timer:
100 -> 150 -> 100 (didn't need to be changed originally)

readds the stun on neckgrab, but more than halves the duration
undoes the weaken nerf on the killgrab
 2016-03-28 22:08:32 -07:00
Cheridan
d371fe770a Merge pull request #16421 from Iamgoofball/SALTY 
[#SALTY] GRAB NERF [FUCK] [BALANCE] [#GRABDATNERF]
 2016-03-28 22:03:49 -05:00
Joan Lung
ce28a7ef3b Merge pull request #16419 from Cheridan/sorrypete 
Cleans up some text formatting
 2016-03-28 18:09:05 -04:00
Robustin
319ad93b6a Update zombie.dm 2016-03-28 18:03:34 -04:00
Nerd Lord
4089b0e1d8 actually I needed that 2016-03-28 18:01:13 -04:00
Nerd Lord
e1b263a56a statpanel includes some useful information, like WHAT THE FUCK IS MY SUMMONER'S HEALTH 2016-03-28 17:48:11 -04:00
Nerd Lord
5b14030c6b typo fixes 2016-03-28 15:17:04 -04:00
KorPhaeron
9bb1408040 Merge pull request #16424 from RemieRichards/bee_fixes 
Bee fixes and updates!
 2016-03-28 13:49:42 -05:00
Nerd Lord
63ba8d1b49 </span> 2016-03-28 12:11:11 -04:00
Nerd Lord
420d637f1e span classes update, reset guardian can now remove specific guardians instead of checking for each 2016-03-28 12:02:07 -04:00
Robustin
854fc36a5a Update zombie.dm 2016-03-28 10:51:36 -04:00
KorPhaeron
e829213938 Mining Balance 2016-03-28 06:30:26 -05:00
KorPhaeron
3709f57f40 Merge pull request #16381 from ChangelingRain/justthetooltip 
Adds alien tooltip style and updates operative tooltip style
 2016-03-27 22:41:15 -05:00
Nerd Lord
050b6326b9 assassin fix 2016-03-27 20:05:26 -04:00
Nerd Lord
bc4da3bfc8 decent meme 2016-03-27 18:15:49 -04:00
Nerd Lord
4f78208635 Holoparasite Theme/Name Datums 2016-03-27 18:08:02 -04:00
Remie Richards
17defb66d4 Bee fixes and updates! 
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
 2016-03-27 21:07:53 +01:00
AndrewJacksonThe2nd
535f3a1b4a aaaaaaaaaaaaaaaaaaaaaa 2016-03-27 12:19:46 -07:00