Skip to content

Commit

Permalink
Merge pull request #373 from Ykipss/suit
Browse files Browse the repository at this point in the history
[PORT] elysium stuff and old syndie suits from old Celadon
  • Loading branch information
MrCat15352 authored Apr 5, 2024
2 parents 4afc5aa + 62ff95c commit c6833bc
Show file tree
Hide file tree
Showing 41 changed files with 207 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/datum/modpack/celadon_old_syndicate_rigs

name = "Старая броня синдиката"

desc = "Старая броня синдиката"

author = "SnrBydlo"

/datum/modpack/celadon_old_syndicate_rigs/pre_initialize()
. = ..()

/datum/modpack/celadon_old_syndicate_rigs/initialize()
. = ..()

/datum/modpack/celadon_old_syndicate_rigs/post_initialize()
. = ..()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_celadon_old_syndicate_rigs.dm"

#include "code/syndicateoldsuit.dm"
42 changes: 42 additions & 0 deletions mod_celadon/celadon_old_syndicate_rigs/code/syndicateoldsuit.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/oldsst
name = "elite SST hardsuit helmet"
desc = "An elite version of the SST helmet, with improved armour and fireproofing. This one gives you a strong feeling of Déjà vu."
alt_desc = "An elite version of the SST helmet, with improved armour and fireproofing. It is in combat mode."
mob_overlay_icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/mob/EliteSSTHardsuitHelm.dmi'
icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/obj/EliteSSTHardsuitHelm.dmi'
icon_state = "hardsuit0-syndiesst"
item_state = "hardsuit1-syndiesst"
hardsuit_type = "syndiesst"

/obj/item/clothing/suit/space/hardsuit/syndi/elite/oldsst
name = "elite SST hardsuit"
desc = "An elite version of the SST hardsuit, with improved armour and fire shielding. This one gives you a strong feeling of Déjà vu."
alt_desc = "An elite version of the SST hardsuit, with improved armour and fire shielding. It is in combat mode."
mob_overlay_icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/mob/EliteSSTHardsuit.dmi'
icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/obj/EliteSSTHardsuit.dmi'
icon_state = "hardsuit0-syndiesst"
item_state = "hardsuit1-syndiesst"
hardsuit_type = "syndiesst"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/oldsst

/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/oldelite
name = "elite syndicate hardsuit helmet"
desc = "An elite version of the syndicate helmet, with improved armour and fireproofing. This one gives you a strong feeling of Déjà vu."
alt_desc = "An elite version of the syndicate helmet, with improved armour and fireproofing. It is in combat mode."
mob_overlay_icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/mob/EliteSyndicateHardsuitHelm.dmi'
icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/obj/EliteSyndicateHardsuitHelm.dmi'
icon_state = "hardsuit0-syndieoldelite"
item_state = "hardsuit1-syndieoldelite"
hardsuit_type = "syndieoldelite"

/obj/item/clothing/suit/space/hardsuit/syndi/elite/oldelite
name = "elite syndicate hardsuit"
desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. This one gives you a strong feeling of Déjà vu."
alt_desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in combat mode."
mob_overlay_icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/mob/EliteSyndicateHardsuit.dmi'
icon = 'mod_celadon/celadon_old_syndicate_rigs/icons/obj/EliteSyndicateHardsuit.dmi'
icon_state = "hardsuit0-syndieoldelite"
item_state = "hardsuit1-syndieoldelite"
hardsuit_type = "syndieoldelite"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/oldelite

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 16 additions & 0 deletions mod_celadon/elysium_stuff/_elysium_stuff.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/datum/modpack/elysium_stuff

name = "Вещи элизиума"

desc = "Штуки элизиума"

author = "SnrBydlo"

/datum/modpack/elysium_stuff/pre_initialize()
. = ..()

/datum/modpack/elysium_stuff/initialize()
. = ..()

/datum/modpack/elysium_stuff/post_initialize()
. = ..()
7 changes: 7 additions & 0 deletions mod_celadon/elysium_stuff/_elysium_stuff.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "_elysium_stuff.dm"

#include "code\armor.dm"
#include "code\skimitar.dm"
#include "code\ElysimMerch.dm"
#include "code\clothing.dm"

75 changes: 75 additions & 0 deletions mod_celadon/elysium_stuff/code/ElysimMerch.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// Miscelanious

/obj/structure/curtain/cloth/elysim
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_type = "elysim_fancy"
icon_state = "elysim_fancy-open"

/obj/item/banner/elysim
name = "Elysim banner"
desc = "The banner of Elysim, Strengthens the faith of those who deserve."
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "banner_elysim"
item_state = "banner_elysim"
lefthand_file = 'mod_celadon/celadon_suits/icons/mob/elysim_banner_left.dmi'
righthand_file = 'mod_celadon/celadon_suits/icons/mob/elysim_banner_right.dmi'
warcry = "Glory to the nation!"

/obj/item/storage/book/bible/koran
name = "Koran"
icon_state = "koran"
item_state = "koran"
deity_name = "Allah"

// Posters

/obj/item/poster/random_elysim
name = "random elysim poster"
poster_type = /obj/structure/sign/poster/elysim/random
icon_state = "rolled_elysim"

/obj/structure/sign/poster/elysim/random
name = "random elysim poster"
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "random_elysim"
never_random = TRUE
random_basetype = /obj/structure/sign/poster/elysim

/obj/structure/sign/poster/elysim/logo // \"Breathable, if it weren't so darn cold.\"
name = "Elysim"
desc = "Poster of Elysim Republic. The most common logo. Nothing noteworthy"
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "poster-elysim"

/obj/structure/sign/poster/elysim/protest
name = "DownSolFed"
desc = "Poster of Elysim Republic. \"This poster with its entire appearance screams No deals with traitors! \""
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "poster-nosf"

/obj/structure/sign/poster/elysim/sonofelysim
name = "Elysim Son"
desc = "Poster of the Elisima Republic depicting a stately man.The inscription reads \"God will direct his punishing hand! For the glory of Elysium!\""
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "poster-son_elysim"

/obj/structure/sign/poster/elysim/ak47
name = "No SolFed"
desc = "Poster of the Elysim Republic depicting iconic weapons from a previous era. \"Even a child is ready to protect his home!\""
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "poster-ak47"

/obj/structure/sign/elysim_wall_seal
name = "Seal of the Elysim government"
desc = "A seal emblazened with a gold trim depicting the burning star, sol."
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "elysim-wall"
pixel_y = 27

/obj/structure/sign/elysim
name = "\improper Elysim logo sign"
sign_change_name = "Rebel Logo - Elysim"
desc = "A sign with the Elysim logo on it. Glory to Human race!"
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
icon_state = "elysim"
is_editable = TRUE
19 changes: 19 additions & 0 deletions mod_celadon/elysium_stuff/code/armor.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//Броня интек

/obj/item/clothing/suit/armor/vest/inteq
name = "InteQ armor vest"
desc = "A modded InteQ Type II armored vest that provides decent protection against most types of damage."
icon = 'mod_celadon/celadon_suits/icons/obj/armor_celadon.dmi'
mob_overlay_icon = 'mod_celadon/celadon_suits/icons/mob/armor_celadon.dmi'
icon_state = "armor_inteq"
item_state = "armor_inteq"
armor = list("melee" = 38, "bullet" = 33, "laser" = 33, "energy" = 43, "bomb" = 28, "bio" = 3, "rad" = 3, "fire" = 53, "acid" = 53)

//Броня элизиум
/obj/item/clothing/suit/armor/vest/elisium
name = "Кустарная броня"
desc = "Самодельная защита сваренная из кусков брони, скрепленных кожей. Просто, но надежно."
icon = 'mod_celadon/celadon_suits/icons/obj/accessories.dmi'
mob_overlay_icon = 'mod_celadon/celadon_suits/icons/mob/accessories.dmi'
icon_state = "armor_plate"
item_state = "armor_plate"
8 changes: 8 additions & 0 deletions mod_celadon/elysium_stuff/code/clothing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/obj/item/bedsheet/elysim
name = "\improper Elysim bedsheet"
desc = "It has the Elysim logo on it ."
icon = 'mod_celadon/celadon_suits/icons/obj/Elysim_patriots.dmi'
mob_overlay_icon = 'mod_celadon/celadon_suits/icons/mob/bedsheet_elysium.dmi'
icon_state = "sheetelysim"
item_state = "sheetelysimback"
dream_messages = list("duty", "fatherland")
19 changes: 19 additions & 0 deletions mod_celadon/elysium_stuff/code/skimitar.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/obj/item/melee/skimitar
name = "Скимитар Элизиума"
desc = "Древнее традиционное Старбульское холодное оружие, которое пользовалось очень большой популярностью среди населения Старбула в 2430 годах по солу."
icon_state = "skimitar"
item_state = "skimitar"
icon = 'mod_celadon/celadon_suits/icons/obj/skimitar.dmi'
lefthand_file = 'mod_celadon/celadon_suits/icons/mob/swords_lefthand.dmi'
righthand_file = 'mod_celadon/celadon_suits/icons/mob/swords_righthand.dmi'
pickup_sound = 'sound/items/unsheath.ogg'
drop_sound = 'sound/items/handling/metal_drop.ogg'
force = 35
throwforce = 30
w_class = WEIGHT_CLASS_BULKY
block_chance = 10
armour_penetration = 35
sharpness = IS_SHARP
attack_verb = list("slashed", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/mob/head.dmi
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/mob/mask.dmi
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/mob/neck.dmi
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/mob/space.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/mob/suit.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/obj/hats.dmi
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/obj/masks.dmi
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/obj/skimitar.dmi
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/obj/space_item.dmi
Binary file not shown.
Binary file not shown.
Binary file added mod_celadon/elysium_stuff/icons/obj/suits.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions mod_celadon/mod_celadon.dme
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

// --- OBJECTS --- //
#include "cargo_items/_cargo_items.dme"
#include "elysium_stuff/_elysium_stuff.dme"
#include "celadon_old_syndicate_rigs/_celadon_old_syndicate_rigs.dme"


// --- MISC --- //
Expand Down

0 comments on commit c6833bc

Please sign in to comment.