cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,124 Commits 61 Branches 14 Tags
55b830f39dd55b563061e931634a6e9ec00a1121
Commit Graph

567 Commits

Author SHA1 Message Date
Jack Edge
8901ee0610 Actually compiles 2016-04-25 09:22:32 +01:00
Jack Edge
508522c320 Minor explosion damage around exploded machine 2016-04-25 07:15:32 +01:00
Jack Edge
e2888a285b player_list -> ai_list 2016-04-24 16:45:35 +01:00
Jack Edge
543101879c Actually makes the processor blow up 2016-04-24 09:08:17 +01:00
Jack Edge
3dc1511725 Merge "<br>"s into single call to the AI 2016-04-23 20:13:54 +01:00
Jack Edge
573c5f70b8 Revert "Removed processor explosion chance" 
This reverts commit 06f34b1634.
 2016-04-23 13:21:40 +01:00
Jack Edge
06f34b1634 Removed processor explosion chance 2016-04-22 14:29:00 +01:00
Jack Edge
cf886fc84d New Processor Overload event 
An exospheric bubble has occured, making the telecommunications
processors overload and shut down (and very occasionally, also explode).

But hey, at least telecommunications is still functional? You just gotta
shout REALLY LOUDLY to make yourself heard over the static.

🆑 coiax
rscadd: Centcom regret to inform you that new instabilities with nearby
gas giants are causing exospheric bubbles to affect the
telecommunications processors. Please contact your supervisor for
further instructions.
/🆑
 2016-04-22 12:22:58 +01:00
Mike Long
05937cecc2 Fixes the other compile errors. 2016-04-10 20:23:52 -04:00
Mike Long
2da9aa3dda Fixes compile error. 2016-04-10 19:48:05 -04:00
Mike Long
d4d2efa546 Adds new ionlaws: This new class of ion laws causes the AI to refer to things by the wrong name. 2016-04-10 19:25:34 -04: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
c0
8807c26945 Shuttle Loan fix 2016-04-07 03:26:38 +03:00
c0
c35fe4ea66 Wizard events will no longer fire unless actually summoned by a wizard 2016-04-06 12:03:44 +03:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -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
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
c0
9f4e6c6c42 Adds two new events-related config options 2016-03-30 02:16:04 +03: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
Cheridan
eeeff80e5f Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues 
Fix bundle
 2016-03-26 21:06:00 -05:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
Nerd Lord
e0d355ced9 why bother with a new PR rite 2016-03-25 21:15:04 -04:00
Nerd Lord
f6406fa1fb You can now click through space vines to attack mobs/grab items underneath them 
Vine/Vine Mob layering adjusted to be under ghosts.
 2016-03-23 11:19:29 -04:00
oranges
2311102c7b Refactors the bulk string framework 
In favour of a better json based solution
This overhauls:
    -AI ion laws
    -NPC chatter text

The system is extended to support further splitting of a chosen line
where a line is picked and then searched for subkey's in the form of
@pick(\D+) - sub keys are then picked from the appropriate list that
matches the \D+ key and replaced over top of the placeholder

This is used to add braindamage gibbering messages to the system
 2016-03-19 22:37:32 +00:00
KorPhaeron
fa77255e97 Merge pull request #16097 from ChangelingRain/poitext 
Wizard Greentext is now on the POI list
 2016-03-14 17:33:35 -05:00
Nerd Lord
4357019a18 Wizard Greentext is now on the POI list 2016-03-13 15:53:08 -04:00
KorPhaeron
e24b6f3608 Merge pull request #15817 from xxalpha/cocks 
Scrubber clog event now has a chance to spawn cockroaches.
 2016-03-13 00:25:59 -06:00
AnturK
cc034af9d4 Merge pull request #15999 from ChangelingRain/placesplease 
Goon-style blob placement
 2016-03-12 21:17:57 +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
1ead1acbfc Goon-style blob placement 2016-03-09 20:21:19 -05:00
Remie Richards
4e821d8657 Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality 2016-03-07 18:03:25 +00:00
xxalpha
f6df8abf56 simpler probability 2016-03-05 20:36:16 +00:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
xxalpha
c61c93a5f3 Scrubber clog event now has a chance to spawn cockroaches. 2016-02-28 15:31:03 +00:00
duncathan salt
cb566509a9 Merge pull request #15728 from ChangelingRain/earlyblob 
Blob event can now happen earlier
 2016-02-26 13:23:21 -06:00
Nerd Lord
08b3c246e9 Blob event can now happen earlier. 
Bonus; fixes a bug where blobbernauts spawned from factories would wander in the 5 seconds before they got a client
 2016-02-24 12:10:00 -05:00
AndrewJacksonThe2nd
5d5d2427f4 temp 2016-02-20 22:12:25 -08:00
Cheridan
0c0d30a0f0 Merge pull request #15640 from tkdrg/kinder_egg_coding 
Fixes the nar-sie event the right way.
 2016-02-20 11:32:05 -06:00
tkdrg
a51c987ae2 Merge pull request #15589 from KorPhaeron/weather2 
Fixes up weather performance
 2016-02-20 09:31:12 -03:00
Tkdrg
734e57828f Fixes the nar-sie event the right way. 
Weight 0 events still run for some stupid reason, they're just rare.
 2016-02-20 08:46:02 -03:00
KazeEspada
e36c114ddf Fixes endless Nar-sies. 
Hopefully this fixes the endless nar-sie storm.
 2016-02-20 02:12:39 -07:00
xxalpha
cdd2673b15 Lower weight, later start. 2016-02-19 22:41:12 +00:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
KorPhaeron
67aec79ecf Weather 2016-02-17 16:28:59 -06:00
xxalpha
238329dba3 Removed mecha pilots from event; added no loot syndies 2016-02-17 15:05:21 +00:00
xxalpha
1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00