cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-09 16:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,048 Commits 60 Branches 14 Tags
fcf544283dac83c978d8b4ea14b3be581a8d2ebe
Commit Graph

1779 Commits

Author SHA1 Message Date
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-24 21:22:37 +02:00
phil235
0caa59b21a First commit of this big PR 
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
 2016-04-24 20:26:24 +02:00
Joan Lung
9894342f50 Merge pull request #17017 from Shadowlight213/Admingib 
Removes brains dropping from admin caused gibs and c4 suicide
 2016-04-23 22:14:36 -04:00
Remie Richards
aad72305b4 Merge pull request #16925 from lzimann/patch-6 
Fix admin midis not being able to be queued
 2016-04-23 12:11:15 +01:00
Leo
893013ecb7 No longer a datum for each player 2016-04-22 15:13:10 -03:00
Shadowlight213
d0670ad141 Removes brains dropping from admin caused gibs and c4 suicide 2016-04-20 20:12:38 -07:00
GunHog
f0fe2a0106 Removes SecHUD from AntagHUD 
The SecHUD has been seperated from the Antag HUD. Admin ghosts can get
this function through the normal Ghost HUD toggle.
 2016-04-20 14:33:08 -05:00
Leo
a761c900b2 The return of queued midis 2016-04-16 19:32:16 -03: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 salt
f568ae3f31 Merge pull request #16425 from Thunder12345/varspotting 
Adds new atom and new datum options to viewvars
 2016-03-31 12:07:14 -06:00
duncathan salt
3315717ef9 Merge pull request #16348 from Shadowlight213/adminsoundvolume 
Adds client volume control for admin sounds.
 2016-03-31 11:59:52 -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
Thunder12345
82b903f827 Neatens some things up 2016-03-27 22:05:58 +01:00
Thunder12345
0161d6fd8f Adds new atom and new datum options to viewvars 2016-03-27 21:37:33 +01:00
Leo
ce5a1da64d Revert "Adds mentorhelp" 2016-03-25 01:48:27 -03:00
Shadowlight213
23b3f77448 Adds volume control for admin sounds. 2016-03-24 21:19:51 -07:00
bawhoppen
109bef0378 easy 2016-03-24 12:56:09 -05:00
bawhoppen
436056cace makes it actually work 2016-03-24 12:41:00 -05:00
bawhoppen
e5ba67ed0b makes code significantly less shit 2016-03-24 12:12:51 -05:00
bawhoppen
860d51f090 touches up mentorhelps 2016-03-23 14:24:39 -05:00
Lularian
fee5324f33 mentorhelp 2016-03-23 10:44:24 -05:00
KorPhaeron
b52e8cb847 Merge pull request #16213 from AnturK/buildmode_fix 
Fixes buildmode dir
 2016-03-21 03:16:31 -05:00
PKPenguin321
3bd3ff20ec adds a couple of naughty missing periods 
@cheridan uuuu
 2016-03-19 23:11:51 -07:00
AnturK
a9b7a27a44 Fixes buildmode dir 2016-03-19 12:36:15 +01:00
AnturK
35bfb9abb6 Merge pull request #16073 from KorPhaeron/humans 
Plasmamen fixes
 2016-03-16 17:48:29 +01:00
KorPhaeron
da8baeaab8 Human fixes 2016-03-15 12:29:35 -05:00
MrStonedOne
cdfce3046e Removes cap on bomb cap 2016-03-15 03:39:43 -07:00
MrStonedOne
71ae9d13aa Adds lag checks to massedit, sdql2, del-all, and the map loader 2016-03-15 03:39:42 -07:00
KorPhaeron
942f0e309e Plasamen fixes 2016-03-12 20:29:10 -06:00
AnturK
cc034af9d4 Merge pull request #15999 from ChangelingRain/placesplease 
Goon-style blob placement
 2016-03-12 21:17:57 +01:00
duncathan salt
d1f8562c04 Merge pull request #16043 from Jordie0608/ifitwasneverusedisitreallybroken 
Fixes broken regex
 2016-03-12 13:55:20 -06:00
Cheridan
af0575cf8b Merge pull request #16016 from KorPhaeron/communications 
Responding to a centcomm message resets the machines cooldown
 2016-03-11 11:58:17 -06: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
KorPhaeron
1f177d3ab2 Communications 2016-03-09 22:42:03 -06:00
Nerd Lord
1ead1acbfc Goon-style blob placement 2016-03-09 20:21:19 -05:00
Jordie
3a6a038322 Merge pull request #15945 from Shadowlight213/Snpcbuttonmove 
Moves SNPC admin buttons to the debug tab
 2016-03-08 18:38:48 +11:00
Joan Lung
a5bcdb086a Merge pull request #15924 from lordpidey/adminantaghud 
Adds admin antag-hud
 2016-03-07 17:42:22 -05:00
Shadowlight213
b5c398a252 Moves SNPC admin buttons to the debug tab 2016-03-05 19:05:54 -08:00
Mike Long
daf13e0f19 Now works with gangs too (provided the gang was created BEFORE antaghud was turned on) 2016-03-05 15:00:29 -05:00
Sawu
3aabb070d8 SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS 
* Updates the CustomiseSNPC verb to be less laggy
* Adds a resetSNPC verb to manually reset one.
* Adds a toggleSNPC verb to change between high and low profile mods
* Added a "High Profile" processing mode that can allow the SNPC to tick at custom rates, for special/story SNPCs
* All SNPCs now spawn as Assistants to prevent head spam.
* SNPCs can now be spawned as a doppelganger, and will take the name of a person with the same job as them.
* SNPCs now only hack doors their job doesn't have access to.
* SNPC augmentation values tweaked
* Runtime caused by limbs fixed
* Runtime caused by assigned the SNPC to be a chef fixed.
* Bartender SNPCs now receive a module which allows them to serve drinks to nearby patrons.
* Fixed Chef SNPCs having incorrect modules and home areas.
* Certain modules will now skip being processed if combat is taking precidence.
* Fixed an incorrect emote.
* Clown SNPCs will now drop less items (to prevent massive piles of soap or bananas)
* SNPCs using the healing module will now try to use stackable healing items, and if they are out, instead use their inbuilt tricordrazine hypospray.
* Janitor SNPCs no longer attempt to mop things, and instead use an inbuilt space-cleaner spray
* Chef SNPCs will no longer leave behind uncooked food when trying to process it.
* Chef SNPCs will now use the smartfridge as a source to make custom food.
* Chef SNPCs will no longer run amok, spraying food everywhere.
* Chef SNPCs will attempt to serve up completed food to the Chef's window
* If a Chef SNPC cannot find any viable food source, they will synthesize clones of regular food, which have a lower nutriment count than the real ones.
* SNPCs will no longer explode into items when entering combat, and will no longer throw guns instead of shooting them.
 2016-03-04 21:14:02 +11:00
Sawu
a932be993f SNPC verb hotfix 2016-03-02 22:05:23 +11:00
Cheridan
ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo 
Remake of #15690. Replaces newcult with oldcult.
 2016-03-01 22:37:58 -06:00
Cheridan
cd20e5ec4b Merge pull request #15815 from Shadowlight213/Commandnamechange 
Adds admin button to change central command's name.
 2016-02-29 15:09:27 -06:00
tkdrg
dc9e446507 Merge pull request #15795 from Menshin/forcefield_cleaning 
Cleaning of singularity fields code
 2016-02-28 23:17:58 -03:00
Shadowlight213
98190462c0 Fixes 2016-02-28 00:21:23 -08:00
Shadowlight213
c895016caa Adds admin button to change central command's name. 2016-02-27 23:38:21 -08:00