diff --git a/baystation12.int b/baystation12.int index 29f9e64646a..d50d2911e72 100644 --- a/baystation12.int +++ b/baystation12.int @@ -1,5 +1,12 @@ -// BEGIN_INTERNALS -/* -AUTO_FILE_DIR: OFF -*/ -// END_INTERNALS +// BEGIN_INTERNALS +/* +MAP_ICON_TYPE: 0 +WINDOW: code\game\atoms.dm;code\modules\clothing\shoes\miscellaneous.dm;maps\tgstation2.dmm +LAST_COMPILE_VERSION: 498.1163 +UPDATE_OBJ_TREE: ON +DIR: code code\game code\game\objects code\game\objects\items code\game\objects\items\weapons code\game\objects\items\weapons\storage code\game\objects\structures code\game\objects\structures\crates_lockers code\game\objects\structures\crates_lockers\closets code\modules code\modules\clothing code\modules\clothing\shoes maps +FILE: maps\tgstation2.dmm +LAST_COMPILE_TIME: 1380983889 +AUTO_FILE_DIR: OFF +*/ +// END_INTERNALS diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 323bed9ed5b..cd8b5420c14 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -161,3 +161,9 @@ can_hold = list( "/obj/item/clothing/mask/luchador" ) + +/obj/item/weapon/storage/belt/inflatable + name = "inflatable duck" + desc = "No bother to sink or swim when you can just float!" + icon_state = "inflatable" + item_state = "inflatable" \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 182a9aa84c0..59ddcf57c94 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -1,74 +1,79 @@ -/obj/structure/closet/athletic_mixed - name = "athletic wardrobe" - desc = "It's a storage unit for athletic wear." - icon_state = "mixed" - icon_closed = "mixed" - -/obj/structure/closet/athletic_mixed/New() - ..() - sleep(2) - new /obj/item/clothing/under/shorts/grey(src) - new /obj/item/clothing/under/shorts/black(src) - new /obj/item/clothing/under/shorts/red(src) - new /obj/item/clothing/under/shorts/blue(src) - new /obj/item/clothing/under/shorts/green(src) - new /obj/item/clothing/under/swimsuit/red(src) - new /obj/item/clothing/under/swimsuit/black(src) - new /obj/item/clothing/under/swimsuit/blue(src) - new /obj/item/clothing/under/swimsuit/green(src) - new /obj/item/clothing/under/swimsuit/purple(src) - - -/obj/structure/closet/boxinggloves - name = "boxing gloves" - desc = "It's a storage unit for gloves for use in the boxing ring." - -/obj/structure/closet/boxinggloves/New() - ..() - sleep(2) - new /obj/item/clothing/gloves/boxing/blue(src) - new /obj/item/clothing/gloves/boxing/green(src) - new /obj/item/clothing/gloves/boxing/yellow(src) - new /obj/item/clothing/gloves/boxing(src) - - -/obj/structure/closet/masks - name = "mask closet" - desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!" - -/obj/structure/closet/masks/New() - ..() - sleep(2) - new /obj/item/clothing/mask/luchador(src) - new /obj/item/clothing/mask/luchador/rudos(src) - new /obj/item/clothing/mask/luchador/tecnicos(src) - - -/obj/structure/closet/lasertag/red - name = "red laser tag equipment" - desc = "It's a storage unit for laser tag equipment." - icon_state = "red" - icon_closed = "red" - -/obj/structure/closet/lasertag/red/New() - ..() - sleep(2) - new /obj/item/weapon/gun/energy/laser/redtag(src) - new /obj/item/weapon/gun/energy/laser/redtag(src) - new /obj/item/clothing/suit/redtag(src) - new /obj/item/clothing/suit/redtag(src) - - -/obj/structure/closet/lasertag/blue - name = "blue laser tag equipment" - desc = "It's a storage unit for laser tag equipment." - icon_state = "blue" - icon_closed = "blue" - -/obj/structure/closet/lasertag/blue/New() - ..() - sleep(2) - new /obj/item/weapon/gun/energy/laser/bluetag(src) - new /obj/item/weapon/gun/energy/laser/bluetag(src) - new /obj/item/clothing/suit/bluetag(src) +/obj/structure/closet/athletic_mixed + name = "athletic wardrobe" + desc = "It's a storage unit for athletic wear." + icon_state = "mixed" + icon_closed = "mixed" + +/obj/structure/closet/athletic_mixed/New() + ..() + sleep(2) + new /obj/item/clothing/under/shorts/grey(src) + new /obj/item/clothing/under/shorts/black(src) + new /obj/item/clothing/under/shorts/red(src) + new /obj/item/clothing/under/shorts/blue(src) + new /obj/item/clothing/under/shorts/green(src) + new /obj/item/clothing/under/swimsuit/red(src) + new /obj/item/clothing/under/swimsuit/black(src) + new /obj/item/clothing/under/swimsuit/blue(src) + new /obj/item/clothing/under/swimsuit/green(src) + new /obj/item/clothing/under/swimsuit/purple(src) + new /obj/item/clothing/mask/snorkel(src) + new /obj/item/clothing/mask/snorkel(src) + new /obj/item/clothing/shoes/swimmingfins(src) + new /obj/item/clothing/shoes/swimmingfins(src) + + + +/obj/structure/closet/boxinggloves + name = "boxing gloves" + desc = "It's a storage unit for gloves for use in the boxing ring." + +/obj/structure/closet/boxinggloves/New() + ..() + sleep(2) + new /obj/item/clothing/gloves/boxing/blue(src) + new /obj/item/clothing/gloves/boxing/green(src) + new /obj/item/clothing/gloves/boxing/yellow(src) + new /obj/item/clothing/gloves/boxing(src) + + +/obj/structure/closet/masks + name = "mask closet" + desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!" + +/obj/structure/closet/masks/New() + ..() + sleep(2) + new /obj/item/clothing/mask/luchador(src) + new /obj/item/clothing/mask/luchador/rudos(src) + new /obj/item/clothing/mask/luchador/tecnicos(src) + + +/obj/structure/closet/lasertag/red + name = "red laser tag equipment" + desc = "It's a storage unit for laser tag equipment." + icon_state = "red" + icon_closed = "red" + +/obj/structure/closet/lasertag/red/New() + ..() + sleep(2) + new /obj/item/weapon/gun/energy/laser/redtag(src) + new /obj/item/weapon/gun/energy/laser/redtag(src) + new /obj/item/clothing/suit/redtag(src) + new /obj/item/clothing/suit/redtag(src) + + +/obj/structure/closet/lasertag/blue + name = "blue laser tag equipment" + desc = "It's a storage unit for laser tag equipment." + icon_state = "blue" + icon_closed = "blue" + +/obj/structure/closet/lasertag/blue/New() + ..() + sleep(2) + new /obj/item/weapon/gun/energy/laser/bluetag(src) + new /obj/item/weapon/gun/energy/laser/bluetag(src) + new /obj/item/clothing/suit/bluetag(src) new /obj/item/clothing/suit/bluetag(src) \ No newline at end of file diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 8df98f42dd3..385249e925b 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -34,6 +34,13 @@ flags = FPRINT|TABLEPASS flags_inv = HIDEFACE +/obj/item/clothing/mask/snorkel + name = "Snorkel" + desc = "For the Swimming Savant." + icon_state = "snorkel" + flags = FPRINT|TABLEPASS + flags_inv = HIDEFACE + //scarves (fit in in mask slot) /obj/item/clothing/mask/bluescarf diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index cdd302ec864..5e326335973 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -125,3 +125,11 @@ name = "laceup shoes" desc = "The height of fashion, and they're pre-polished!" icon_state = "laceups" + +/obj/item/clothing/shoes/swimmingfins + desc = "Help you swim good." + name = "swimming fins" + icon_state = "flippers" + flags = NOSLIP + slowdown = SHOES_SLOWDOWN+1 + species_restricted = null diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 1c3dbd2b3a7..2dcf98290ec 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index d994f6a63c1..62dc45d5999 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index e3a8edd4dd1..f768b7ee7be 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 5c18a649acc..80054cc58be 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 797163e50fe..d1f0b3c3393 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index d0965f8136f..7fa4cb7b781 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ