Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 19:46:38 +00:00

Files

MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel

Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm

2014-03-02 21:39:27 -08:00

DB ban

Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob.

2013-07-16 07:26:51 +02:00

permissionverbs

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00

verbs

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel

2014-03-02 21:39:27 -08:00

admin_investigate.dm

Cleaned up the UI and fixed bugs.