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

978 Commits

Author SHA1 Message Date
duncathan salt
61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader 
[DNM] Updates the map loader to support TGM style map files
 2016-04-25 09:28:26 -06: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
YotaXP
03d38bf895 Adds a 'measureOnly' mode to the maploader code for templates. 2016-04-18 16:04:35 -04: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
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
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
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
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
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
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
tkdrg
84566ef751 Merge pull request #15773 from AnturK/template_fix 
Fixes uploaded templates size preview
 2016-02-27 21:40:22 -03:00
Menshin
7374902800 * Cleaning field generator code 
* Fixes runtimes on field shutdown
 2016-02-27 22:44:17 +01:00
Shadowlight213
642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08:00
Tkdrg
cd549bb33b Fixes wrong irc message 2016-02-26 21:29:13 -03:00
AnturK
19e188322c Fixes uploaded templates. 2016-02-26 17:41:30 +01:00
tkdrg
45fca87806 Merge pull request #15687 from AnturK/template_improvements 
Template loading improvements
 2016-02-25 16:29:10 -03:00
AnturK
e22dddb50a Minor Improvements 2016-02-23 21:44:21 +01:00
AnturK
d282727fd5 Fixes mass modify for file type. 2016-02-22 22:42:41 +01:00
AnturK
4e0db5664b Adds /turf/template_noop and /area/template_noop to dmm reader 2016-02-22 19:24:45 +01:00
AnturK
07432da284 Fixes off-by-one errors. 
Adds template area preview
 2016-02-22 19:09:31 +01:00