cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,434 Commits 61 Branches 14 Tags
022d9e573fd80db94a1507a9db6c052d7c7fe8e0
Commit Graph

1109 Commits

Author SHA1 Message Date
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
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
AnturK
2a327b1b7b Merge pull request #16188 from Robustin/zap 
Singularity beacon now attracts the Tesla Ball
 2016-03-22 19:18:45 +01: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
Robustin
b1fbd3a0b6 Update energy_ball.dm 2016-03-18 16:46:41 -04:00
Robustin
a152febb5a Update energy_ball.dm 2016-03-18 16:30:19 -04:00
Nerd Lord
f7a2348ef7 Nar-Sie will now corrupt doors, tables, windows, and windoors 2016-03-17 16:28:26 -04:00
MrStonedOne
958d9dacfb Fixes the singularity not eating/pulling turfs. 2016-03-15 04:06:34 -07:00
MrStonedOne
b601033c76 Singulo processes by tile, not atom, to avoid pulling something that's moved. 2016-03-15 03:39:46 -07:00
MrStonedOne
09fb8c2b10 Explosions and singulo use spiral range (and other changes) 2016-03-15 03:39:41 -07:00
MrStonedOne
2887dc7ce0 Removes lag. 
This setup allows subsystems to pause themselves until next mc fire if they are about to go over a tick, and resume on the next mc tick
It also makes it so we prioritize running subsystems we skipped because there wasn't enough time in the current tick to run them based on their avg tick usage. (as well as subsystems paused mid way thru)

Adds a macro for adding this to non-mc procs. just drop it in the loop. There is a define version as well for if checks if you want to know if you just slept to avoid lag.

This is all inside #if DM_VERSION defines, so once i test that 509 still works to compile/test this should be good to merge
 2016-03-15 03:39:39 -07:00
duncathan salt
8deb644e48 Merge pull request #15915 from Menshin/PA_code_cleaning 
Cleaning of the Particule Accelerator code
 2016-03-12 13:37:33 -06:00
AnturK
0df3e55d04 Merge pull request #16019 from ChangelingRain/unactionable 
The gravity generator is no longer permanently destroyed by the blob
 2016-03-11 17:33:25 +01: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
Nerd Lord
3656ca9d40 The gravity generator is no longer permanently destroyed by the blob. 2016-03-10 10:29:40 -05:00
Nerd Lord
c02c647a89 i'm not even sure what this does tbhtbthbthtbthtbhthtbthtbthtbthtbthtbththbthbthtbh 2016-03-08 20:42:11 -05:00
Nerd Lord
1424548e14 The blob can now be shocked by the tesla 
Strong blobs are now much more resistant to brute damage. Don't even bother hitting them with a wrench.

Tweaks blob reagents;
Removes Ripping Tendrils and Draining Spikes
Sporing Pods now does much less damage, and is less likely to produce spores when killed
Replicating Foam now takes increased brute damage and when expanding from damage, will not expand again
Energized Fibers no longer heals when hit with stamina damage, and is instead immune to the tesla
Boiling Oil takes damage from extinguisher blasts. Its blobbernauts, however, do not
Flammable Goo takes 50% increased burn damage
Regenerative Materia, Hallucinogenic Nectar, and Envenomed Filaments each do less toxin damage
Poisonous Strands applies its damage over a longer period of time
Explosive Lattice now takes much higher damage from fire, flashbangs, and the tesla
Reactive Gelatin now has a lower minimum damage
Electromagnetic Web takes full brute damage, lasers will now one-hit normal blobs, and the death EMP is smaller
Cryogenic Liquid does less burn damage
Pressurized Slime does less brute damage
 2016-03-08 20:27:57 -05:00
Cheridan
5b38a76e22 Merge pull request #15962 from Iamgoofball/patch-1 
You can now hear the tesla from 4 screens away.
 2016-03-08 12:35:54 -06:00
Iamgoofball
b64836d27d You can now hear the tesla from 4 screens away. 
If you still don't have warning that the tesla is loose after this, consider investing in speakers or a headset.
 2016-03-07 08:54:19 -08:00
Kyle Spier-Swenson
f3870e93a2 de-nerfs the tesla slightly 2016-03-06 12:09:48 -08:00
Menshin
21e2ce4e25 Cleaning of the Particule Accelerator code 2016-03-06 10:23:37 +01:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
Menshin
7374902800 * Cleaning field generator code 
* Fixes runtimes on field shutdown
 2016-02-27 22:44:17 +01:00
tkdrg
180bd6de79 Merge pull request #15588 from AnturK/isbuffingthisactuallygoodidea 
Fixes tesla southern tendency.
 2016-02-18 18:35:26 -03:00
AnturK
56d2a34201 Splits beds and chairs 
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
 2016-02-18 17:55:38 +01:00
AnturK
422b55d2f9 Fixes tesla southern tendency. 2016-02-17 22:52:10 +01:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
Kyle Spier-Swenson
7dc5c2b684 Fixes the tesla going nuts if deleted at the wrong moment. 2016-02-12 18:49:38 -08:00
tkdrg
fa287ee090 Merge pull request #15146 from Buggy123/patch-13 
Adds cable coils to autolathe
 2016-02-12 21:39:40 -03:00
Buggy123
5788e89ffa Added cable coils to the autolathe 
Cable coils will only be built in stacks of 30, at maximum.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Fixed it not compiling?

Finally got it to compile

Fixes bad code

removed unnecessary /var

Added maxstack var to define custom stack sizes for things

Allowed the autolathe to use custom stack sizes.

Adds correct maxstack values to various stackable objects
 2016-02-12 18:17:34 -05:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
Razharas
4e84fc7fe9 Merge pull request #15338 from tkdrg/whoa 
[s]Fixes server crash by abusing containment fields
 2016-02-11 04:23:46 +03:00
AnturK
b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130 
[Ready]Tesla balance and code cleanup
 2016-02-10 11:36:32 +01:00
Bjorn Neergaard
5975449a31 Fix gravity gen logging during init 2016-02-09 23:45:02 -06:00
Bjorn Neergaard
cbd37b6e77 Fix gravity generator runtime 
Checking turf Z is silly when mob checks make more sense

The following runtime has occured 53 time(s).
runtime error: Cannot read null.z
proc name: shake everyone (/obj/machinery/gravity_generator/main/proc/shake_everyone)
  source file: gravitygenerator.dm,360
  usr: null
  src: the gravitational generator (/obj/machinery/gravity_generator/main/station)
 2016-02-09 23:04:58 -06:00
Tkdrg
ae1c4c3007 Fixes server crash by abusing containment fields 2016-02-08 21:08:45 -03:00
MrStonedOne
60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
 2016-02-07 17:41:42 -08:00
MrStonedOne
eef4f4d534 Optimizes tesla_zap, adds fuel tank tesla_act, misc tesla changes 2016-02-07 17:34:52 -08:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
 2016-02-06 15:42:13 +01:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard
c5e6a922ca Cache canister updates and make huge scrubbers use power; add movable version 2016-02-05 17:06:03 -06:00
xxalpha
68dedb9ee2 Reverts #15187 2016-02-05 01:28:44 +00:00
xxalpha
3316070ac0 Merge remote-tracking branch 'upstream/master' into putin 2016-02-05 01:27:26 +00:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
 2016-02-04 14:34:45 +01:00
xxalpha
cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00