mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
Moves Cellguns to their own folder. (#12681)
* the great relocation * Update readme.md
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
||||
/obj/item/weaponcell
|
||||
name = "default weaponcell"
|
||||
desc = "used to add ammo types to guns"
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/upgrades.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/medicells.dmi'
|
||||
icon_state = "Oxy1"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
/// The ammo type that is added by default when inserting a cell.
|
||||
+2
-2
@@ -498,7 +498,7 @@
|
||||
name = "salve globule"
|
||||
desc = "a ball of regenerative synthetic plant matter, contained within a soft hardlight field"
|
||||
embedding = list("embed_chance" = 100, ignore_throwspeed_threshold = TRUE, "pain_mult" = 0, "jostle_pain_mult" = 0, "fall_chance" = 0)
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon_state = "globule"
|
||||
heals_left = 40 //This means it'll be heaing 15 damage per type max.
|
||||
var/attached_part //The part that the globule is attached to
|
||||
@@ -526,7 +526,7 @@
|
||||
/obj/structure/bed/roller/medigun
|
||||
name = "hardlight roller bed"
|
||||
desc = "A Roller Bed made out of Hardlight"
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi'
|
||||
max_integrity = 1
|
||||
buildstacktype = FALSE //It would not be good if people could use this to farm materials.
|
||||
var/deploytime = 20 SECONDS //How long the roller beds lasts for without someone buckled to it.
|
||||
+7
-7
@@ -2,7 +2,7 @@
|
||||
/obj/item/gun/energy/cell_loaded/medigun
|
||||
name = "medigun"
|
||||
desc = "This is my smart gun, it won't hurt anyone friendly, infact it will make them heal! Please tell github if you somehow manage to get this gun."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/projectile.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/projectile.dmi'
|
||||
icon_state = "medigun"
|
||||
inhand_icon_state = "chronogun" // Fits best with how the medigun looks, might be changed in the future
|
||||
ammo_type = list(/obj/item/ammo_casing/energy/medical) // The default option that heals oxygen
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
/obj/item/gun/energy/cell_loaded/medigun/upgraded/Initialize()
|
||||
. = ..()
|
||||
var/mutable_appearance/fastcharge_medigun = mutable_appearance('modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/projectile.dmi', "medigun_fastcharge")
|
||||
var/mutable_appearance/fastcharge_medigun = mutable_appearance('modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/projectile.dmi', "medigun_fastcharge")
|
||||
add_overlay(fastcharge_medigun)
|
||||
|
||||
// CMO and CC MediGun
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
/obj/item/gun/energy/cell_loaded/medigun/cmo/Initialize()
|
||||
. = ..()
|
||||
var/mutable_appearance/cmo_medigun = mutable_appearance('modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/projectile.dmi', "medigun_cmo")
|
||||
var/mutable_appearance/cmo_medigun = mutable_appearance('modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/projectile.dmi', "medigun_cmo")
|
||||
add_overlay(cmo_medigun)
|
||||
|
||||
// Medigun power cells
|
||||
@@ -71,7 +71,7 @@
|
||||
// Medigun wiki book
|
||||
/obj/item/book/manual/wiki/mediguns
|
||||
name = "medigun operating manual"
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon_state = "manual"
|
||||
starting_author = "VeyMedical"
|
||||
starting_title = "Medigun Operating Manual"
|
||||
@@ -82,7 +82,7 @@
|
||||
/obj/item/storage/briefcase/medicalgunset/
|
||||
name = "medigun supply kit"
|
||||
desc = "A supply kit for the medigun."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/misc.dmi'
|
||||
icon_state = "case_standard"
|
||||
inhand_icon_state = "lockbox"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
|
||||
@@ -118,7 +118,7 @@
|
||||
/obj/item/weaponcell/medical
|
||||
name = "default medicell"
|
||||
desc = "The standard oxygen cell, most guns come with this already installed."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/upgrades.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/medicells.dmi'
|
||||
icon_state = "Oxy1"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
ammo_type = /obj/item/ammo_casing/energy/medical // This is the ammo type that all mediguns come with.
|
||||
@@ -286,7 +286,7 @@
|
||||
//Empty Medicell//
|
||||
/obj/item/device/custom_kit/empty_cell //Having the empty cell as an upgrade kit sounds jank, but it should work well.
|
||||
name = "empty salve medicell"
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/upgrades.dmi'
|
||||
icon = 'modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/medicells.dmi'
|
||||
icon_state = "empty"
|
||||
desc = "An inactive salve medicell, use this on an aloe leaf to make this into a usable cell."
|
||||
from_obj = /obj/item/food/grown/aloe
|
||||
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.7 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 950 B After Width: | Height: | Size: 950 B |
@@ -0,0 +1,26 @@
|
||||
## Title: Cell Guns
|
||||
|
||||
MODULE ID: cellguns
|
||||
|
||||
### Description:
|
||||
|
||||
Contains the code for cellguns and mediguns. If you are making any cellguns, please put them inside of this folder!
|
||||
|
||||
### TG Proc Changes:
|
||||
|
||||
- CMO Medigun kit has been added to the CMO locker.
|
||||
- Various changes have been made to the master research files to include Medicells and Medigun Upgrades.
|
||||
|
||||
### Defines:
|
||||
|
||||
- #define UPGRADED_MEDICELL_PASSFLAGS PASSTABLE | PASSGLASS | PASSGRILLE
|
||||
- #define MINIMUM_TEMP_DIFFERENCE 25
|
||||
- #define TEMP_PER_SHOT 30
|
||||
|
||||
### Master file additions
|
||||
|
||||
### Included files that are not contained in this module:
|
||||
|
||||
### Credits:
|
||||
|
||||
softcerv
|
||||
+5
-5
@@ -4836,6 +4836,11 @@
|
||||
#include "modular_skyrat\modules\cargoborg\code\robot_modules.dm"
|
||||
#include "modular_skyrat\modules\cell_component\code\cell_component.dm"
|
||||
#include "modular_skyrat\modules\cell_component\code\flashlight.dm"
|
||||
#include "modular_skyrat\modules\cellguns\code\cellgun_cells.dm"
|
||||
#include "modular_skyrat\modules\cellguns\code\cellguns.dm"
|
||||
#include "modular_skyrat\modules\cellguns\code\medigun_cells.dm"
|
||||
#include "modular_skyrat\modules\cellguns\code\medigun_research.dm"
|
||||
#include "modular_skyrat\modules\cellguns\code\mediguns.dm"
|
||||
#include "modular_skyrat\modules\central_command_module\code\computers\command_report_computer.dm"
|
||||
#include "modular_skyrat\modules\central_command_module\code\computers\ert_control_computer.dm"
|
||||
#include "modular_skyrat\modules\central_command_module\code\computers\station_goal_computer.dm"
|
||||
@@ -5399,12 +5404,7 @@
|
||||
#include "modular_skyrat\modules\modular_vending\code\wardrobes.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\autolathe_designs.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\automatic.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\cellguns.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\energy.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\guncells.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\medcells.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\medguns.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\mediguns.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\modular_projectiles.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\pistol.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\recipes.dm"
|
||||
|
||||
Reference in New Issue
Block a user