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.

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

Adrenal and F.R.A.M.E. tweak #28

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8bd10cd
huds added
MrCastmer Feb 22, 2024
2e409e9
Merge branch 'master' into hud
MrCastmer Feb 22, 2024
362445a
huds edit
MrCastmer Feb 22, 2024
7214d0c
Update hud.dmi
MrCastmer Feb 22, 2024
e344c19
Merge pull request #2 from MrCastmer/hud
MrCastmer Feb 26, 2024
aa40c34
adrenal tweak
MrCastmer Feb 28, 2024
c5cee07
Update hud.dmi
MrCastmer Feb 28, 2024
624a270
Merge branch 'master' into adrenal_tweak
MrCastmer Feb 28, 2024
715f5d6
Update medicine_reagents.dm
MrCastmer Feb 28, 2024
752e92c
Merge branch 'master' into adrenal_tweak
MrCastmer Feb 29, 2024
4d20782
Merge branch 'master' into adrenal_tweak
MrCastmer Mar 7, 2024
d977a79
FRAME
MrCastmer Mar 7, 2024
84732b6
Merge branch 'master' into adrenal_tweak
MrCastmer Mar 27, 2024
9b9a042
Merge branch 'master' into adrenal_tweak
MrCastmer Mar 27, 2024
dd7e827
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 6, 2024
b830070
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 9, 2024
e90a769
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 12, 2024
e16722b
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 12, 2024
0021bd2
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 19, 2024
66fc641
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 26, 2024
6597911
Merge branch 'master' into adrenal_tweak
MrCastmer Apr 26, 2024
ed1ea8c
Merge branch 'master' into adrenal_tweak
MrCastmer Jul 18, 2024
415760e
Merge branch 'master' into adrenal_tweak
MrCastmer Jul 18, 2024
4a42b77
Merge branch 'master' into adrenal_tweak
MrCastmer Aug 8, 2024
236d20e
Merge branch 'master' into adrenal_tweak
MrCastmer Dec 3, 2024
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: 2 additions & 2 deletions code/game/objects/items/implants/implant_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
name = "adrenal implant"
desc = "Removes all stuns."
icon_state = "adrenal"
uses = 3
uses = 2 //dripstation edit

/obj/item/implant/adrenalin/get_data()
var/dat = {"<b>Implant Specifications:</b><BR>
Expand Down Expand Up @@ -46,7 +46,7 @@

imp_in.reagents.add_reagent(/datum/reagent/medicine/synaptizine, 10)
imp_in.reagents.add_reagent(/datum/reagent/medicine/omnizine, 10)
imp_in.reagents.add_reagent(/datum/reagent/medicine/stimulants, 10)
imp_in.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5) //dripstation edit, just like ninja
if(!uses)
qdel(src)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ GLOBAL_LIST_EMPTY(PDAFrameCodes)

/datum/ntosframecode
var/code = ""
var/uses = 5
var/uses = 3 //dripstation edit, changed from 5

/datum/ntosframecode/New()
code = "[num2hex(rand(1,65535), -1)][num2hex(rand(1,65535), -1)]" // 8 hexadecimal digits
Expand Down
4 changes: 3 additions & 1 deletion modular_dripstation/code/modules/uplink/uplink_items.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
////////////Syndicate/////////////
/datum/uplink_item/device_tools/frame
cost = 2
/datum/uplink_item/suits/hardsuit
name = "Blood-red RIG"
desc = "The feared suit of a Syndicate nuclear operative. Features slightly better armoring and a built in jetpack \
Expand Down Expand Up @@ -256,4 +258,4 @@
Slowly recharges, but incredibly robust."
item = /obj/item/module/shield/nt
cost = 30
cant_discount = TRUE
cant_discount = TRUE
Loading