cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,937 Commits 61 Branches 14 Tags
751e309d792c22db29b48fb38e092a9db13ce3fc
Commit Graph

484 Commits

Author SHA1 Message Date
Joan Lung
2ed1fa4dae Merge pull request #16841 from MrStonedOne/patch-189 
Tweaks minimap
 2016-04-14 09:37:20 -04:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
Kyle Spier-Swenson
f9749a42ac Update minimap.dm 2016-04-12 17:42:41 -07:00
Kyle Spier-Swenson
3d9312f360 Tweaks minimap 
Now that we know the crashes from minimaps are a case of the clean bot bug, we can re-enable them.

And this should make them faster as well.
 2016-04-12 17:32:31 -07:00
AnturK
fee254926e Merge pull request #16680 from Core0verload/nomoremagic 
Wizard events will no longer fire unless actually summoned by a wizard
 2016-04-09 15:57:30 +02:00
Cheridan
694e78ca03 Merge pull request #16566 from Iamgoofball/patch-17 
makes fastprocess EVEN FASTER #speed #MrFastOne
 2016-04-07 21:28:05 -05:00
duncathan salt
11966e5508 Merge pull request #16660 from MrStonedOne/patch-186 
[ready]Makes SSair's initialize() faster.
 2016-04-06 10:39:04 -06:00
MrStonedOne
546148cb33 Makes atmos init much much much much much faster. 2016-04-06 04:25:04 -07:00
c0
c35fe4ea66 Wizard events will no longer fire unless actually summoned by a wizard 2016-04-06 12:03:44 +03: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
Kyle Spier-Swenson
358c5fe0b4 Fixes ssair locking up the server while it initialized 2016-04-05 08:51:34 -07:00
duncathan salt
1cf07c2445 Merge pull request #16561 from MrStonedOne/ssairtweaks 
Tweaks atmos: excited groups and ssair
 2016-04-04 20:54:37 -06:00
Cheridan
28092ea3a6 Merge pull request #16567 from bear1ake/GRJ-job.title 
Fixes Give Random (Head) Job
 2016-04-04 21:27:43 -05:00
MrStonedOne
e514eb0f36 fixes some bugs with excited groups and ssair under duncmos 2016-04-04 14:22:41 -07:00
MrStonedOne
363f848bc8 Tweaks atmos: excited groups and ssair 
Excited groups will be much more aggressive about averaging out their turfs when air movement within has slowed down.
Excited groups will be less aggressive about sleeping simi-idle turfs to prevent deadlocking
Sleeping thresholds lowered.
SSair will now tick_check all loops, not just active turf processing.
 2016-04-04 14:22:40 -07:00
duncathan
700bd10678 fixes plasma hanging out in space; removes debug messages 2016-04-04 00:32:40 -06: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
bear1ake
e690c83e51 Fixes Give Random (Head) Job 2016-04-02 14:10:34 +09:00
Iamgoofball
d6c3bb482b makes fastprocess EVEN FASTER #speed #MrFastOne 2016-04-01 21:57:25 -07:00
Kyle Spier-Swenson
0c133555e2 Makes lighting tick as fast as it can. 2016-04-01 21:29:54 -07:00
duncathan salt
bcc92cf76f Merge pull request #16471 from Core0verload/events 
Adds minimal players requirements for random events
 2016-03-31 12:14:44 -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
duncathan
3525bcfcbb fixes huge roundstart bugs 2016-03-30 16:07:35 -06:00
Iamgoofball
68e752b461 Update fastprocess.dm 2016-03-29 18:45:22 -07:00
Iamgoofball
a03678419d WHOOOOPS 2016-03-29 18:44:56 -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
c0
23fb45ba6e Adds minimal players requirements for random event 2016-03-29 08:49:17 +03: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
AndrewJacksonThe2nd
d70279e203 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port 2016-03-22 16:13:17 -07:00
Kyle Spier-Swenson
94dbb51347 Removing from active needs to happen before excited group garbage collection 2016-03-20 03:40:49 -07:00
Kyle Spier-Swenson
f81ec7fc44 remove_from_active now handles unsimulated turfs properly 2016-03-20 03:27:37 -07:00
oranges
d4a5d61ea5 Minor tweak and fixes to subsystem logic 
-only process roundstart spawners when they're needed

-use the same method to call atom_spawners for template loading.
    Assuming user is adding to the appropriate process list, this will not
cause issues
 2016-03-19 22:41:38 +00:00
oranges
f9e6e2bca7 Add subsystem for safely spawning atoms at roundstart 
This system is called just before initialize and does not use a world
loop, so it is safe to spawn and create new atoms.

Any atom can inherit this behaviour by overriding the
spawn_atom_to_world proc and spawning atoms there at roundstart

Make sure you register the atom in question to the list of spawner atoms
by doing SSobj.atom_spawners += src, and then remove when you are done
spawning objects
 2016-03-19 22:41:38 +00:00
MrStonedOne
5945c38608 Adds lag checks to SSsmooth 2016-03-15 03:44:41 -07:00
MrStonedOne
9829b34abb Config option for generating minimaps, defaults to disabled, for coder's sanity 2016-03-15 03:39:45 -07:00
MrStonedOne
aa328e404f Adds lag check to diseases and events (and removes lighting from dwait) 
lighting removed from dewait because lag checks are better for it and lag checked subsystems that are also dwait systems are given lower priority, we don't want that to happen to lighting.
 2016-03-15 03:39:44 -07:00
MrStonedOne
bc8ff11f3f Lag check on initialization (and on a missed del-all proc) 2016-03-15 03:39:43 -07:00
MrStonedOne
09fb8c2b10 Explosions and singulo use spiral range (and other changes) 2016-03-15 03:39:41 -07:00
MrStonedOne
093668a445 fixes deadlocking 2016-03-15 03:39:40 -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
Cheridan
0288f7c592 Merge pull request #16067 from xxalpha/silky_smooth 
icon smooth ss
 2016-03-15 04:59:48 -05:00
Sawu
fc56e7f529 SNPC Expansion v. Traitorous Scum 
* Fixes SNPCs still healing people
* SNPCs now use similar speech handling to Poly, and will mimic phrases in addition to their usual speech
* SNPCs can now be spawned as traitors, and given a special role.
* Greytide SNPCs now wear assistant outfits
* Certain jobs are now restricted to their area (can be toggled with restrictedJob)
* SNPCs start with a minor variation in stats
* Bartender SNPCs should now appropriately serve people
* Chef SNPC workflow redone, they will now prioritise preparing food over making it, and should serve more food to tables
* Third attempt at fixing infighting
* SNPCs should no longer repeatedly stun a target
* Friendly SNPCs now no longer have a combat module, and they are the station's faction
* NPCPool will routinely trim orders from it, reducing the amount of order ping-pong
 2016-03-13 18:21:37 +11:00
xxalpha
e2dd404d39 Smooth z1 and z2 on initialize. 2016-03-13 00:43:37 +00:00
xxalpha
688137c7dc icon smooth ss 
adjustments

adjustements

atharrachaidhean
 2016-03-12 23:57:45 +00:00
Jordie0608
5ee92abad3 fixes broken regex 2016-03-11 21:43:32 +11: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