-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OPFOR Items Reloaded (#24231) (#284)
* init * changes akula clothing category to a broader piracy clothing category * please commit this one too * some sorting * more cleaning * dme fix * edits edits edits * adds and edits * finishing the outfit selection * modsuits * mod modules * more stuff! * implants * (many) more edits * all lists filled * strange autosurgeon * bugfix * bugs * arm autosurgeon fix * review * y * nitpicks * fixes theft kits Co-authored-by: lila <[email protected]>
- Loading branch information
1 parent
696234b
commit eb5fff8
Showing
54 changed files
with
1,817 additions
and
1,526 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
modular_skyrat/master_files/code/game/objects/items/hhmirror.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
modular_skyrat/modules/moretraitoritems/code/autosurgeon.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /obj/item/autosurgeon/toolset | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/toolset | ||
|
|
||
| /obj/item/autosurgeon/surgery | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/surgery | ||
|
|
||
| /obj/item/autosurgeon/botany | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/botany | ||
|
|
||
| /obj/item/autosurgeon/janitor | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/janitor | ||
|
|
||
| /obj/item/autosurgeon/armblade | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/armblade | ||
|
|
||
| /obj/item/autosurgeon/muscle | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/muscle | ||
|
|
||
| //syndie | ||
| /obj/item/autosurgeon/syndicate/hackerman | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/hacker | ||
|
|
||
| /obj/item/autosurgeon/syndicate/esword_arm | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/esword | ||
|
|
||
| /obj/item/autosurgeon/syndicate/nodrop | ||
| starting_organ = /obj/item/organ/internal/cyberimp/brain/anti_drop | ||
|
|
||
| /obj/item/autosurgeon/syndicate/baton | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/baton | ||
|
|
||
| /obj/item/autosurgeon/syndicate/flash | ||
| starting_organ = /obj/item/organ/internal/cyberimp/arm/flash | ||
|
|
||
| //bodypart | ||
| /obj/item/autosurgeon/bodypart/r_arm_robotic | ||
| starting_bodypart = /obj/item/bodypart/arm/right/robot | ||
|
|
||
| /obj/item/autosurgeon/bodypart/r_arm_robotic/Initialize(mapload) | ||
| . = ..() | ||
| storedbodypart.icon = 'modular_skyrat/master_files/icons/mob/augmentation/hi2ipc.dmi' | ||
|
|
||
| //xeno-organs | ||
| /obj/item/autosurgeon/xeno | ||
| name = "strange autosurgeon" | ||
| icon = 'modular_skyrat/modules/moretraitoritems/icons/alien.dmi' | ||
| surgery_speed = 2 | ||
| organ_whitelist = list(/obj/item/organ/internal/alien) | ||
|
|
||
| /obj/item/organ/internal/alien/plasmavessel/opfor | ||
| stored_plasma = 500 | ||
| max_plasma = 500 | ||
| plasma_rate = 10 | ||
|
|
||
| /obj/item/storage/organbox/strange | ||
| name = "strange organ transport box" | ||
| icon = 'modular_skyrat/modules/moretraitoritems/icons/alien.dmi' | ||
|
|
||
| /obj/item/storage/organbox/strange/Initialize(mapload) | ||
| . = ..() | ||
| reagents.add_reagent_list(list(/datum/reagent/cryostylane = 60)) | ||
|
|
||
| /obj/item/storage/organbox/strange/PopulateContents() | ||
| new /obj/item/autosurgeon/xeno(src) | ||
| new /obj/item/organ/internal/alien/plasmavessel/opfor(src) | ||
| new /obj/item/organ/internal/alien/resinspinner(src) | ||
| new /obj/item/organ/internal/alien/acid(src) | ||
| new /obj/item/organ/internal/alien/neurotoxin(src) | ||
| new /obj/item/organ/internal/alien/hivenode(src) | ||
|
|
||
| /obj/item/storage/organbox/strange/eggsac/PopulateContents() | ||
| . = ..() | ||
| new /obj/item/organ/internal/alien/eggsac(src) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /obj/item/clothing/glasses/hud/health/night/cultblind_unrestricted | ||
| desc = "Where we are going, we won't need eyes to see." | ||
| name = "zealot's blindfold" | ||
| icon_state = "blindfold" | ||
| inhand_icon_state = "blindfold" | ||
| flash_protect = FLASH_PROTECTION_WELDER | ||
|
|
||
| /obj/item/clothing/glasses/hud/health/night/cultblind_unrestricted/narsie | ||
| desc = "May Nar'Sie guide you through the darkness and shield you from the light." |
This file was deleted.
Oops, something went wrong.
41 changes: 0 additions & 41 deletions
41
modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| //Heister kit | ||
| /obj/item/clothing/suit/jacket/det_suit/noir/heister | ||
| name = "armored suit jacket" | ||
| desc = "A professional suit jacket, it feels much heavier than a regular jacket. A label on the inside reads \"Nanite-based Self-repairing Kevlar weave\"." | ||
| armor_type = /datum/armor/heister | ||
| /// How many hits we can take before the armor breaks, PAYDAY style | ||
| var/armor_stacks = 2 | ||
|
|
||
| /datum/armor/heister | ||
| melee = 35 | ||
| bullet = 30 | ||
| laser = 30 | ||
| energy = 40 | ||
| bomb = 25 | ||
| fire = 50 | ||
| acid = 50 | ||
| wound = 10 | ||
|
|
||
| /obj/item/clothing/suit/jacket/det_suit/noir/heister/Initialize(mapload) | ||
| . = ..() | ||
| AddComponent(/datum/component/shielded/suit, max_charges = armor_stacks, recharge_start_delay = 8 SECONDS, charge_increment_delay = 1 SECONDS, \ | ||
| charge_recovery = armor_stacks, lose_multiple_charges = FALSE, starting_charges = armor_stacks, shield_icon_file = null, shield_icon = null) | ||
|
|
||
| /obj/item/clothing/suit/jacket/det_suit/noir/heister/equipped(mob/living/user, slot) | ||
| . = ..() | ||
| if(!(slot & ITEM_SLOT_OCLOTHING)) | ||
| return | ||
| RegisterSignal(user, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(armor_reaction)) | ||
|
|
||
| /obj/item/clothing/suit/jacket/det_suit/noir/heister/proc/armor_reaction(mob/living/carbon/human/owner, atom/movable/hitby, damage = 0, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0) | ||
| if(SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, owner, hitby, attack_text, 0, damage, attack_type) & COMPONENT_HIT_REACTION_BLOCK) | ||
| return SHIELD_BLOCK | ||
| return NONE | ||
|
|
||
| /obj/item/clothing/gloves/latex/nitrile/heister | ||
| desc = "Pricy sterile gloves that are thicker than latex. Perfect for hiding fingerprints." | ||
| clothing_traits = null | ||
| siemens_coefficient = 0 |
Oops, something went wrong.