diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 6e92a044c91..05f8b2762e7 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -26,8 +26,8 @@ var/required_players = 0 var/required_enemies = 0 var/recommended_enemies = 0 - var/uplink_welcome - var/uplink_uses + var/uplink_welcome = "Syndicate Uplink Console:" + var/uplink_uses = 10 var/uplink_items = {"Highly Visible and Dangerous Weapons; /obj/item/weapon/gun/projectile:6:Revolver; /obj/item/ammo_magazine/a357:2:Ammo-357; diff --git a/code/modules/clothing/head/miscellaneous.dm b/code/modules/clothing/head/miscellaneous.dm index ad4538d21d5..8061c3cd44e 100644 --- a/code/modules/clothing/head/miscellaneous.dm +++ b/code/modules/clothing/head/miscellaneous.dm @@ -127,12 +127,3 @@ flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH see_face = 0.0 flags_inv = HIDEMASK|HIDEEARS|HIDEEYES - -/obj/item/clothing/head/pumpkinhead - name = "carved pumpkin" - desc = "A jack o' lantern! Believed to ward off evil spirits." - icon_state = "hardhat0_pumpkin" - item_state = "hardhat0_pumpkin" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR - see_face = 0.0 - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES \ No newline at end of file diff --git a/code/modules/clothing/head/pumpkin.dm b/code/modules/clothing/head/pumpkin.dm new file mode 100644 index 00000000000..5e25e3036f2 --- /dev/null +++ b/code/modules/clothing/head/pumpkin.dm @@ -0,0 +1,35 @@ +/obj/item/clothing/head/pumpkinhead + name = "carved pumpkin" + desc = "A jack o' lantern! Believed to ward off evil spirits." + icon_state = "hardhat0_pumpkin"//Could stand to be renamed + item_state = "hardhat0_pumpkin" + flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR + see_face = 0.0 + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES + var/brightness_on = 2 //luminosity when on + var/on = 0 + + attack_self(mob/user) + if(!isturf(user.loc)) + user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. + return + on = !on + icon_state = "hardhat[on]_[color]" + item_state = "hardhat[on]_[color]" + + if(on) + user.total_luminosity += brightness_on + else + user.total_luminosity -= brightness_on + + pickup(mob/user) + if(on) + user.total_luminosity += brightness_on + user.UpdateLuminosity() + src.sd_SetLuminosity(0) + + dropped(mob/user) + if(on) + user.total_luminosity -= brightness_on + user.UpdateLuminosity() + src.sd_SetLuminosity(brightness_on) \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 8838a8ae0b5..87a88beb38d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -23,7 +23,6 @@ #define FILE_DIR "code/defines/mob/living/carbon" #define FILE_DIR "code/defines/mob/living/silicon" #define FILE_DIR "code/defines/obj" -#define FILE_DIR "code/defines/obj/clothing" #define FILE_DIR "code/defines/procs" #define FILE_DIR "code/defines/tanning" #define FILE_DIR "code/FEA" @@ -117,7 +116,6 @@ #define FILE_DIR "code/modules/mob/living/carbon/alien/larva" #define FILE_DIR "code/modules/mob/living/carbon/brain" #define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/human/Tajara" #define FILE_DIR "code/modules/mob/living/carbon/metroid" #define FILE_DIR "code/modules/mob/living/carbon/monkey" #define FILE_DIR "code/modules/mob/living/silicon" @@ -820,6 +818,7 @@ #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\helmet.dm" #include "code\modules\clothing\head\miscellaneous.dm" +#include "code\modules\clothing\head\pumpkin.dm" #include "code\modules\clothing\head\security.dm" #include "code\modules\clothing\head\welding.dm" #include "code\modules\clothing\masks\boxing.dm"