cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-29 20:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds medieval+crusader armor and the ways of getting them

Browse Source 
One force-push commit edition
This commit is contained in:
Anonymous
2018-08-01 19:20:53 +03:00
parent ce0a5a1dd0
commit b0382db43a
10 changed files with 269 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/arcade.dm
+4
View File
@@ -11,6 +11,10 @@
/obj/item/weapon/gun/projectile/revolver/capgun = 2,
/obj/item/toy/crossbow = 2,
/obj/item/clothing/suit/syndicatefake = 2,
/obj/item/clothing/head/medievalfake = 2, //
/obj/item/clothing/suit/medievalfake = 2, // Citadel
/obj/item/clothing/suit/medievalfake/crusader = 2, // Addition
/obj/item/clothing/head/medievalfake/crusader = 2, //
/obj/item/weapon/storage/fancy/crayons = 2,
/obj/item/toy/spinningtoy = 2,
/obj/item/toy/prize/ripley = 1,
code/game/objects/structures/trash_pile.dm
+4
View File
@@ -201,6 +201,8 @@
prob(1);/obj/item/clothing/under/harness,
prob(1);/obj/item/clothing/under/tactical,
prob(1);/obj/item/clothing/suit/armor/material/makeshift,
prob(1);/obj/item/clothing/head/medievalfake/crusader, //Citadel Addition
prob(1);/obj/item/clothing/suit/medievalfake/crusader/dark, //Citadel Addition
prob(1);/obj/item/device/flashlight/glowstick/orange,
prob(1);/obj/item/device/flashlight/glowstick/red,
prob(1);/obj/item/device/flashlight/glowstick/yellow,
@@ -233,6 +235,8 @@
prob(2);/obj/item/device/nif/bad, //Citadel Override probability, 0.7%
prob(2);/obj/item/device/bodysnatcher, //Citadel Override probability, 0.7%
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
prob(1);/obj/item/clothing/head/helmet/medieval/crusader, // Citadel Addition
prob(1);/obj/item/clothing/suit/armor/medieval/crusader/dark, // Citadel Addition
// prob(1);/obj/item/device/nif/bad, // VORECode default probability, 0.2%
prob(1);/obj/item/device/radio_jammer,
prob(1);/obj/item/device/sleevemate,
modular_citadel/code/datums/supplypacks/contraband_cit.dm
+30
View File
@@ -0,0 +1,30 @@
/datum/supply_packs/supply/medieval
name = "Knight set crate"
contains = list(
/obj/item/clothing/head/helmet/medieval/red = 1,
/obj/item/clothing/head/helmet/medieval/green = 1,
/obj/item/clothing/head/helmet/medieval/blue = 1,
/obj/item/clothing/head/helmet/medieval/yellow = 1,
/obj/item/clothing/suit/armor/medieval/red = 1,
/obj/item/clothing/suit/armor/medieval/green = 1,
/obj/item/clothing/suit/armor/medieval/blue = 1,
/obj/item/clothing/suit/armor/medieval/yellow = 1
)
cost = 100
containertype = /obj/structure/closet/crate
containername = "knight set crate"
contraband = 1
/datum/supply_packs/supply/deusvult
name = "Crusader set crate"
contains = list(
/obj/item/clothing/head/helmet/medieval/crusader/templar = 2,
/obj/item/clothing/suit/armor/medieval/crusader/cross/templar = 1,
/obj/item/clothing/suit/armor/medieval/crusader/cross/hospitaller = 1,
/obj/item/clothing/head/helmet/medieval/crusader = 3,
/obj/item/clothing/suit/armor/medieval/crusader/cross = 3
)
cost = 100
containertype = /obj/structure/closet/crate
containername = "crusader crate"
contraband = 1
modular_citadel/code/datums/supplypacks/costumes_cit.dm
+28
View File
@@ -0,0 +1,28 @@
/datum/supply_packs/costumes/larp
name = "Knight cosplay crate"
contains = list(
/obj/item/clothing/head/medievalfake/red = 1,
/obj/item/clothing/head/medievalfake/green = 1,
/obj/item/clothing/head/medievalfake/blue = 1,
/obj/item/clothing/head/medievalfake/yellow = 1,
/obj/item/clothing/suit/medievalfake/red = 1,
/obj/item/clothing/suit/medievalfake/green = 1,
/obj/item/clothing/suit/medievalfake/blue = 1,
/obj/item/clothing/suit/medievalfake/yellow = 1
)
cost = 50
containertype = /obj/structure/closet/crate
containername = "knight cosplay crate"
/datum/supply_packs/costumes/situla_vult
name = "Crusader cosplay crate"
contains = list(
/obj/item/clothing/head/medievalfake/crusader/templar = 2,
/obj/item/clothing/suit/medievalfake/crusader/cross/templar = 1,
/obj/item/clothing/suit/medievalfake/crusader/cross/hospitaller = 1,
/obj/item/clothing/head/medievalfake/crusader = 3,
/obj/item/clothing/suit/medievalfake/crusader/cross = 3
)
cost = 50
containertype = /obj/structure/closet/crate
containername = "crusader cosplay crate"
modular_citadel/code/modules/clothing/suits/medieval_armor.dm
+198
View File
@@ -0,0 +1,198 @@
// Helmets
/obj/item/clothing/head/helmet/medieval
name = "medieval helmet"
desc = "A classic metal helmet, effective at stopping melee attacks."
icon = 'modular_citadel/icons/obj/clothing/medieval_helmet.dmi'
icon_override = 'modular_citadel/icons/mob/medieval_helmet.dmi'
icon_state = "knight"
item_state = "knight"
armor = list(melee = 40, bullet = 5, laser = 5, energy = 5, bomb = 5, bio = 0, rad = 0)
body_parts_covered = HEAD|FACE|EYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
/obj/item/clothing/head/helmet/medieval/red
icon_state = "knight_red"
item_state = "knight_red"
/obj/item/clothing/head/helmet/medieval/green
icon_state = "knight_green"
item_state = "knight_green"
/obj/item/clothing/head/helmet/medieval/blue
icon_state = "knight_blue"
item_state = "knight_blue"
/obj/item/clothing/head/helmet/medieval/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
// Armours
/obj/item/clothing/suit/armor/medieval
name = "plate armour"
desc = "A classic suit of plate armour, effective at stopping melee attacks."
armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
icon = 'modular_citadel/icons/obj/clothing/medieval_armor.dmi'
icon_override = 'modular_citadel/icons/mob/medieval_armor.dmi'
icon_state = "knight"
item_state = "knight"
slowdown = 1
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/armor/medieval/red
icon_state = "knight_red"
item_state = "knight_red"
/obj/item/clothing/suit/armor/medieval/green
icon_state = "knight_green"
item_state = "knight_green"
/obj/item/clothing/suit/armor/medieval/blue
icon_state = "knight_blue"
item_state = "knight_blue"
/obj/item/clothing/suit/armor/medieval/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
// Crusader stuff
// Helmets
/obj/item/clothing/head/helmet/medieval/crusader
name = "great helm"
desc = "A classic, great metal helmet, effective at stopping melee attacks."
icon_state = "crusader"
item_state = "crusader"
/obj/item/clothing/head/helmet/medieval/crusader/templar
name = "templar great helm"
desc = "Deus Vult!"
icon_state = "crusader_templar"
item_state = "crusader_templar"
// Armours
/obj/item/clothing/suit/armor/medieval/crusader
name = "bland crusader armour"
desc = "A classic suit of plate armour, usually worn by crusaders. It doesn't have any insignia."
icon_state = "crusader"
item_state = "crusader"
/obj/item/clothing/suit/armor/medieval/crusader/cross
name = "crusader armour"
desc = "God wills it!"
icon_state = "crusader_cross"
item_state = "crusader_cross"
/obj/item/clothing/suit/armor/medieval/crusader/cross/templar
name = "templar crusader armour"
icon_state = "crusader_templar"
item_state = "crusader_templar"
/obj/item/clothing/suit/armor/medieval/crusader/cross/hospitaller
name = "hospitaller crusader armour"
icon_state = "crusader_hospitaller"
item_state = "crusader_hospitaller"
/obj/item/clothing/suit/armor/medieval/crusader/dark
name = "dark crusader armour"
desc = "A classic suit of plate armour, usually worn by crusaders. This one is dark, with no insignia."
icon_state = "crusader_dark"
item_state = "crusader_dark"
//
/// Replica stuff
//
/obj/item/clothing/head/medievalfake
name = "medieval helmet replica"
desc = "A plastic replica of knight helmet. Great for tabletop and LARP sessions, not great at stopping melee attacks."
icon = 'modular_citadel/icons/obj/clothing/medieval_helmet.dmi'
icon_override = 'modular_citadel/icons/mob/medieval_helmet.dmi'
icon_state = "knight"
item_state = "knight"
body_parts_covered = HEAD|FACE|EYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
/obj/item/clothing/head/medievalfake/green
icon_state = "knight_green"
item_state = "knight_green"
/obj/item/clothing/head/medievalfake/blue
icon_state = "knight_blue"
item_state = "knight_blue"
/obj/item/clothing/head/medievalfake/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
/obj/item/clothing/head/medievalfake/red
icon_state = "knight_red"
item_state = "knight_red"
// Armours
/obj/item/clothing/suit/medievalfake
name = "plate armour replica"
desc = "A plastic replica of knight armor. Great for tabletop and LARP sessions, not great at stopping melee attacks."
icon = 'modular_citadel/icons/obj/clothing/medieval_armor.dmi'
icon_override = 'modular_citadel/icons/mob/medieval_armor.dmi'
icon_state = "knight"
item_state = "knight"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/medievalfake/green
icon_state = "knight_green"
item_state = "knight_green"
/obj/item/clothing/suit/medievalfake/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
/obj/item/clothing/suit/medievalfake/blue
icon_state = "knight_blue"
item_state = "knight_blue"
/obj/item/clothing/suit/medievalfake/red
icon_state = "knight_red"
item_state = "knight_red"
// Crusader stuff
// Helmet
/obj/item/clothing/head/medievalfake/crusader
name = "great helm replica"
desc = "A plastic replica of classic great helmet."
icon_state = "crusader"
item_state = "crusader"
/obj/item/clothing/head/medievalfake/crusader/templar
name = "templar great helm replica"
desc = "Situla Vult!"
icon_state = "crusader_templar"
item_state = "crusader_templar"
// Armour
/obj/item/clothing/suit/medievalfake/crusader
name = "bland crusader armour replica"
desc = "A plastic replica of knight armor with crusader feeling to it. It doesn't have any insignia."
icon_state = "crusader"
item_state = "crusader"
/obj/item/clothing/suit/medievalfake/crusader/cross
name = "crusader armour replica"
desc = "A plastic replica of knight armor with crusader feeling to it."
icon_state = "crusader_cross"
item_state = "crusader_cross"
/obj/item/clothing/suit/medievalfake/crusader/cross/templar
name = "templar crusader armour replica"
icon_state = "crusader_templar"
item_state = "crusader_templar"
/obj/item/clothing/suit/medievalfake/crusader/cross/hospitaller
name = "hospitaller crusader armour replica"
icon_state = "crusader_hospitaller"
item_state = "crusader_hospitaller"
/obj/item/clothing/suit/medievalfake/crusader/dark
name = "dark crusader armour replica"
desc = "A plastic replica of knight armor with crusader feeling to it. This one is painted dark."
icon_state = "crusader_dark"
item_state = "crusader_dark"
modular_citadel/icons/mob/medieval_armor.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

modular_citadel/icons/mob/medieval_helmet.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

modular_citadel/icons/obj/clothing/medieval_armor.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

modular_citadel/icons/obj/clothing/medieval_helmet.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 971 B

vorestation.dme
+5 -2
View File
@@ -2931,17 +2931,20 @@
#include "maps\tether\tether.dm"
#include "maps\~map_system\maps.dm"
#include "modular_citadel\code\datums\outfits\jobs\centcom.dm"
#include "modular_citadel\code\game\objects\items\weapons\storage\donatorbackpack.dm"
#include "modular_citadel\code\datums\supplypacks\contraband_cit.dm"
#include "modular_citadel\code\datums\supplypacks\costumes_cit.dm"
#include "modular_citadel\code\datums\supplypacks\misc_vr.dm"
#include "modular_citadel\code\game\objects\items\weapons\storage\donatorbackpack.dm"
#include "modular_citadel\code\modules\admin\chat_commands.dm"
#include "modular_citadel\code\modules\clothing\under\accessories\holster.dm"
#include "modular_citadel\code\modules\client\preference_setup\loadout.dm"
#include "modular_citadel\code\modules\client\preference_setup\loadout_donator.dm"
#include "modular_citadel\code\modules\clothing\donatorclothing.dm"
#include "modular_citadel\code\modules\clothing\suits\donatorarmor.dm"
#include "modular_citadel\code\modules\clothing\suits\donatorlabcoat.dm"
#include "modular_citadel\code\modules\clothing\suits\medieval_armor.dm"
#include "modular_citadel\code\modules\clothing\under\donatoruniform.dm"
#include "modular_citadel\code\modules\clothing\under\accessories\donatoraccessory.dm"
#include "modular_citadel\code\modules\clothing\under\accessories\holster.dm"
#include "modular_citadel\code\modules\mob\living\simple_animal\simple_animal_vr.dm"
#include "modular_citadel\code\modules\vore\eating\living_vr.dm"
// END_INCLUDE