Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: DBs can now be holstered #510

Closed
wants to merge 18 commits into from
Closed

Feat: DBs can now be holstered #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
951b95c
DBs can be holstered
Yata9arasu Oct 20, 2023
4c24553
DBs can be Holstered
Yata9arasu Oct 21, 2023
faecc43
need modular things
Yata9arasu Oct 21, 2023
d067b08
deleting trash
Yata9arasu Oct 21, 2023
19c2fcb
fixing thing
Yata9arasu Oct 21, 2023
5c49a15
deleted trash
Yata9arasu Oct 21, 2023
8fb2342
uhhh
Yata9arasu Oct 21, 2023
cd0316d
yes
Yata9arasu Oct 21, 2023
a6b3c17
yep
Yata9arasu Oct 21, 2023
7564441
Back to working version
Yata9arasu Oct 21, 2023
57ace45
fixing thing that broke my code
Yata9arasu Oct 21, 2023
aa5e811
fixed space
Yata9arasu Oct 21, 2023
76889c3
no need for blank spaces
Yata9arasu Oct 21, 2023
628ac4d
changed name and paths
Yata9arasu Oct 21, 2023
255cd5f
deleted trash
Yata9arasu Oct 21, 2023
43b121b
Update delta.dmm
Yata9arasu Oct 22, 2023
0bf972a
Merge branch 'devtest' into master
Yata9arasu Oct 22, 2023
f863b4e
Added more code (hope it works)
Yata9arasu Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/DBs_In_Holsters
name = "Обрезы в кобуру"
desc = "Обрезы теперь можно убирать в кобуру."
author = "Yata9arasu"
3 changes: 3 additions & 0 deletions modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_holstered_sawedoff.dm"

#include "code/holstered_sawedoff.dm"
12 changes: 12 additions & 0 deletions modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user)
. = ..()
weapon_weight = WEAPON_MEDIUM
can_holster = TRUE

/obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
. = ..()
if(. && sling) //sawing off the gun removes the sling
new /obj/item/stack/cable_coil(get_turf(src), 10)
sling = FALSE
update_icon(UPDATE_ICON_STATE)
can_holster = TRUE
3 changes: 0 additions & 3 deletions modular_ss220/maps220/code/Areas/station.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
/area/station/security/checkpoint/south
name = "\improper Escape Security Checkpoint"

/area/station/security/visitingroom
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:ache:

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

откуда они вылезли вообще...

name = "\improper Brig Visiting Room"
icon_state = "brig"
/area/station/bridge/checkpoint
name = "\improper Command Checkpoint"

Expand Down
10 changes: 10 additions & 0 deletions modular_ss220/modular_ss220.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include "title_screen/_title_screen.dme"
#include "whitelist/_whitelist.dme"
#include "outfits/_outfits.dme"
#include "holstered_sawedoff/_holstered_sawedoff.dme"
#include "world_view_bigger/_world_view_bigger.dme"

// --- PRIME --- //
Expand All @@ -91,3 +92,12 @@
---------------------------------------------------------------------*/

// #include "crit_rework/_crit_rework.dme"
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
// END_FILE_DIR
// BEGIN_PREFERENCES
// END_PREFERENCES
// BEGIN_INCLUDE
// END_INCLUDE