diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6f2548284bd..cac781c5040 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -469,7 +469,7 @@ icon_state = "plasma-c" plasma = 500.0 - +/* /obj/item/weapon/game_kit name = "Gaming Kit" icon = 'items.dmi' @@ -480,6 +480,7 @@ var/base_url = "http://svn.slurm.us/public/spacestation13/misc/game_kit" item_state = "sheet-metal" w_class = 5.0 +*/ /obj/item/weapon/gift name = "gift" diff --git a/icons/changelog.html b/icons/changelog.html index 97577e6ae9b..5fe7655fab9 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -41,7 +41,7 @@ Coders: TLE, NEO, muskets, veryinky, Skie, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem
Spriters: Skie, Agouri, Uhangi, Deuryn
Sounds: Skie
- Thanks to: CDK Station devs, GoonStation devs and original SpaceStation developers + Thanks to: CDK Station devs, GoonStation devs, the original SpaceStation developers and Erikat for the new title image

Changelog

diff --git a/icons/misc/fullscreen.dmi b/icons/misc/fullscreen.dmi index e24ebdb472f..27660acd81c 100644 Binary files a/icons/misc/fullscreen.dmi and b/icons/misc/fullscreen.dmi differ