Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 04:21:42 +00:00

Files

Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi

2015-11-02 01:06:30 -03:00

client defines.dm

Moves procs to appropriate files, Adds some sanity+feature wrapper procs for Tooltips, adds some UI style themed CSS classes to use as tooltip themes (Auto used by the wrapper if no theme specified)

2015-10-21 12:53:45 +01:00

client procs.dm

Merge pull request #12557 from RemieRichards/Ports-GoonTooltips-ByWireWraith

2015-10-23 22:16:22 +02:00

message.dm

Cleans up isbanned() and stickyban handling

2015-09-26 23:30:26 -07:00

preferences_savefile.dm

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts