Skip to content

Commit

Permalink
Rayne Corp Items (Monkestation#4460)
Browse files Browse the repository at this point in the history
* scroink

* hre we go

* hjk

* jkjk

* lantern mostly done time to bugtest

* ncie

* ham

* xsdfghb

* orgniz
  • Loading branch information
ThePooba authored Dec 4, 2024
1 parent b7dafe0 commit 4dd78b1
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/__DEFINES/~monkestation/blueshift.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ See the examinemore module for information.
#define CARGO_COMPANY_SOL_DEFENSE (1<<7)
#define CARGO_COMPANY_MICROSTAR (1<<8)
#define CARGO_COMPANY_VITEZSTVI_AMMO (1<<9)
#define CARGO_COMPANY_RAYNE (1<<10)
//#define CARGO_COMPANY_KEMETEK (1<<11)

// Company names, because the armament category and company name need to be the exact same, so use defines like this
#define NAKAMURA_ENGINEERING_MODSUITS_NAME "Nakamura Engineering MOD Divison"
Expand All @@ -245,6 +247,8 @@ See the examinemore module for information.
#define SOL_DEFENSE_DEFENSE_NAME "Sol Defense Imports"
#define MICROSTAR_ENERGY_NAME "MicroStar Energy Weapon Coalition"
#define VITEZSTVI_AMMO_NAME "Vitezstvi Ammo & Weapon Accessories"
#define RAYNE_CORP_NAME "Rayne Corporation"
//#define KEMETEK_NAME "Kemetek Aerospace"

#define COMPANY_INTEREST_GAIN_BIG 10
#define COMPANY_INTEREST_GAIN_AVERAGE 5
Expand Down
37 changes: 37 additions & 0 deletions monkestation/code/game/objects/items/rayne_corp/rayne_lantern.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/obj/item/flashlight/lantern/rayne
name = "lantern"
icon_state = "lantern"
inhand_icon_state = "lantern"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
desc = "A lantern that hangs off the shoulder providing some warmth and lighting with an incandescent heat lamp. \
This is an old piece of technology, usefull for exploring cold planetoids or the void of space. \
It is stamped with a Rayne Corp logo on the bottom."
light_outer_range = 5// luminosity when on
light_system = OVERLAY_LIGHT
icon = 'monkestation/icons/obj/rayne_corp/rayne.dmi'
icon_state = "rayne_lantern"
inhand_icon_state = "lantern" // todo
worn_icon = 'monkestation/icons/obj/rayne_corp/rayne.dmi'
worn_icon_state = "rayne_lantern_worn"
slot_flags = ITEM_SLOT_NECK

/obj/item/flashlight/lantern/rayne/process(seconds_per_tick)

var/mob/living/user = loc
if(!istype(user))
return
user.adjust_bodytemperature(2 * seconds_per_tick, max_temp = user.standard_body_temperature)

/obj/item/flashlight/lantern/rayne/toggle_light()
..()
//icon_state = "rayne_lantern_[on ? "on" : "off"]"
if(on)
START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj, src)
var/mob/user = loc
if(!istype(user))
return
balloon_alert(user, "heater [on ? "on" : "off"]")
return TRUE
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/obj/item/storage/medkit/rayne
name = "Rayne Corp Health Analyzer Kit"
icon = 'icons/obj/device.dmi'
item_flags = NOBLUDGEON
7 changes: 7 additions & 0 deletions monkestation/code/modules/blueshift/armaments/kemetek.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//TODO add organ harvesting suit module
/datum/armament_entry/company_import/kemetek
category = KEMETEK_NAME
company_bitflag = CARGO_COMPANY_KEMETEK

/datum/armament_entry/company_import/kemetek/checkback
subcategory = "Check back soon! ™"
25 changes: 25 additions & 0 deletions monkestation/code/modules/blueshift/armaments/rayne.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/datum/armament_entry/company_import/rayne
category = RAYNE_CORP_NAME
company_bitflag = CARGO_COMPANY_RAYNE

/datum/armament_entry/company_import/rayne/clothing
subcategory = "Clothing Supplies"

/datum/armament_entry/company_import/rayne/clothing/lamp
// name = "Wearable Rayne Corporation Chest Lamp"
item_type = /obj/item/flashlight/lantern/rayne
cost = PAYCHECK_COMMAND * 3

//Rayne Corp Medkit: A portable medkit that contains a cynical artificial intelligence that can diagnose and treat your injuries, but also insults you and makes sarcastic comments about your condition.
//automender but it sucks and hates you

//Rayne Corp Sticky Tiles: A synthetic tile that has a special adhesive property that can cushion any fall and prevent serious damage,
//but also traps you in place until you can free yourself or get help. The Sticky Tile is ideal for people who are clumsy and prone to accidents.

//Rayne Corp Teleporter: A device that can teleport you to any location, but also swaps your body parts with random objects or animals. The Teleporter is convenient and fast. It can let you travel anywhere,
//in an instant. The Teleporter can also create amusing and weird situations, as you may end up with a different appearance, function,
//or ability, after teleporting. However, the Teleporter can be very painful, and can damage your health, identity, or sanity, if used too often.
//razor that shaves you so bald you flash people when examined
//GIANT MOUSETRAP
//Rayne Corp Homerun bat
//Rayne corp auto injector (its just autop injects maints pills)
Binary file added monkestation/icons/obj/rayne_corp/rayne.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6097,6 +6097,7 @@
#include "monkestation\code\game\objects\items\guns\wt_ammo.dm"
#include "monkestation\code\game\objects\items\implants\hardlight.dm"
#include "monkestation\code\game\objects\items\objects\items\robot\robot_upgrades.dm"
#include "monkestation\code\game\objects\items\rayne_corp\rayne_lantern.dm"
#include "monkestation\code\game\objects\items\robot\items\hypo.dm"
#include "monkestation\code\game\objects\items\stacks\tile_types.dm"
#include "monkestation\code\game\objects\items\storage\book.dm"
Expand Down Expand Up @@ -6639,6 +6640,7 @@
#include "monkestation\code\modules\blueshift\armaments\microstar.dm"
#include "monkestation\code\modules\blueshift\armaments\nakamura.dm"
#include "monkestation\code\modules\blueshift\armaments\nri.dm"
#include "monkestation\code\modules\blueshift\armaments\rayne.dm"
#include "monkestation\code\modules\blueshift\armaments\sol.dm"
#include "monkestation\code\modules\blueshift\armaments\vitezstvi.dm"
#include "monkestation\code\modules\blueshift\benos\human_changes.dm"
Expand Down

0 comments on commit 4dd78b1

Please sign in to comment.