cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small Changes (#1836)

Browse Source 
devices and tools.dm ~Advanced pinpointer added
implant.dm ~loyalty implants melt when EMP'd
nuclear_bomb.dm ~ code goes to delta when activated
microwave.dm ~ Fixes #1668
lockbox.dm ~ medal box added
exodus-1.dmm ~ medal box added
storage.dmi ~ medal box icon added
advanced pin pointer was 25 but after talking to some people they said 15 is better, I don't know though
This commit is contained in:
printer16
2017-02-25 22:13:02 +02:00
committed by skull132
parent dceacd805b
commit d97afa0bee
8 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/devices and tools.dm
+6
View File
@@ -9,6 +9,12 @@
item_cost = 2
path = /obj/item/weapon/storage/toolbox/syndicate
/datum/uplink_item/item/tools/advancedpinpointer
name = "Advanced pinpointer"
item_cost = 15
path = /obj/item/weapon/pinpointer/advpinpointer
desc = "An advanced pinpointer that can find any target with DNA along with various other items."
/datum/uplink_item/item/tools/money
name = "Operations Funding"
item_cost = 2
code/game/machinery/kitchen/microwave.dm
+4 -4
View File
@@ -141,13 +141,13 @@
return 1
else if(istype(O,/obj/item/weapon/crowbar))
user.visible_message( \
"<span class='notice'>\The [user] begins [src.anchored ? "securing" : "unsecuring"] the microwave.</span>", \
"<span class='notice'>You attempt to [src.anchored ? "secure" : "unsecure"] the microwave.</span>"
"<span class='notice'>\The [user] begins [src.anchored ? "unsecuring" : "securing"] the microwave.</span>", \
"<span class='notice'>You attempt to [src.anchored ? "unsecure" : "secure"] the microwave.</span>"
)
if (do_after(user,20))
user.visible_message( \
"<span class='notice'>\The [user] [src.anchored ? "secures" : "unsecures"] the microwave.</span>", \
"<span class='notice'>You [src.anchored ? "secure" : "unsecure"] the microwave.</span>"
"<span class='notice'>\The [user] [src.anchored ? "unsecures" : "secures"] the microwave.</span>", \
"<span class='notice'>You [src.anchored ? "unsecure" : "secure"] the microwave.</span>"
)
src.anchored = !src.anchored
else
code/game/machinery/nuclear_bomb.dm
+5
View File
@@ -11,6 +11,7 @@ var/bomb_set
var/lighthack = 0
var/timeleft = 120
var/timing = 0
var/alerted = 0
var/r_code = "ADMIN"
var/code = ""
var/yes_code = 0
@@ -290,6 +291,10 @@ var/bomb_set
update_icon()
else
secure_device()
if(alerted == 0)
set_security_level(SEC_LEVEL_DELTA)
alerted = 1
if (href_list["safety"])
if (wires.IsIndexCut(NUCLEARBOMB_WIRE_SAFETY))
usr << "<span class='warning'>Nothing happens, something might be wrong with the wiring.</span>"
code/game/objects/items/weapons/implants/implant.dm
+20
View File
@@ -346,6 +346,26 @@ the implant may become unstable and either pre-maturely inject the subject or si
H << "<span class='notice'>You feel a surge of loyalty towards [company_name].</span>"
return 1
emp_act(severity)
if (malfunction)
return
malfunction = MALFUNCTION_TEMPORARY
activate("emp")
if(severity == 1)
if(prob(50))
meltdown()
else if (prob(50))
malfunction = MALFUNCTION_PERMANENT
processing_objects.Remove(src)
return
spawn(20)
malfunction--
implanted(mob/source as mob)
//mobname = source.real_name
processing_objects.Add(src)
return 1
/obj/item/weapon/implant/adrenalin
name = "adrenalin"
code/game/objects/items/weapons/storage/lockbox.dm
+33
View File
@@ -99,3 +99,36 @@
New()
..()
new /obj/item/weapon/gun/energy/lawgiver(src)
/obj/item/weapon/storage/lockbox/medal
name = "medal box"
desc = "A locked box used to store medals."
icon_state = "medalbox+l"
item_state = "syringe_kit"
w_class = 3
max_w_class = 2
req_access = list(access_captain)
icon_locked = "medalbox+l"
icon_closed = "medalbox"
icon_broken = "medalbox+b"
/obj/item/weapon/storage/lockbox/medal/New()
..()
new /obj/item/clothing/accessory/medal
new /obj/item/clothing/accessory/medal
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/conduct
new /obj/item/clothing/accessory/medal/bronze_heart
new /obj/item/clothing/accessory/medal/bronze_heart
new /obj/item/clothing/accessory/medal/nobel_science
new /obj/item/clothing/accessory/medal/nobel_science
new /obj/item/clothing/accessory/medal/silver
new /obj/item/clothing/accessory/medal/iron/merit
new /obj/item/clothing/accessory/medal/silver/valor
new /obj/item/clothing/accessory/medal/silver/security
new /obj/item/clothing/accessory/medal/silver/security
new /obj/item/clothing/accessory/medal/gold
html/changelogs/Printer16- SmallChanges.yml
+10
View File
@@ -0,0 +1,10 @@
author: Printer16
delete-after: True
changes:
- rscadd: "Arming a nuclear device to explode (Saftey off and timer counting down) now raises the code to delta."
- rscadd: "Traitors can now buy an advanced pinpointer."
- rscadd: "Added the medal box back."
- tweak: "Loyalty implants now have a chance to melt when exposed to EMP's."
- bugfix: "Microwaves now display a proper message when crowbared."
icons/obj/storage.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

maps/exodus-1.dmm
+1 -1
View File
@@ -3923,7 +3923,7 @@
"bxw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/rnd/lab)
"bxx" = (/obj/item/device/radio/intercom/locked{frequency = 1343; locked_frequency = 1343; name = "Private AI Channel"; pixel_x = 0; pixel_y = -27},/turf/simulated/floor/tiled/dark{name = "cooled dark floor"; temperature = 278},/area/turret_protected/ai_upload)
"bxy" = (/obj/machinery/light{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/obj/machinery/porta_turret{dir = 8},/turf/simulated/floor/bluegrid{name = "cooled mainframe floor"; temperature = 278},/area/turret_protected/ai_upload)
"bxz" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet,/area/crew_quarters/captain)
"bxz" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/storage/lockbox/medal,/turf/simulated/floor/carpet,/area/crew_quarters/captain)
"bxA" = (/obj/structure/bed/chair/comfy/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/camera/network/command{c_tag = "Bridge - Captain's Quarters"; dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
"bxB" = (/obj/structure/table/woodentable,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/item/weapon/storage/box/matches,/obj/item/clothing/mask/smokable/cigarette/cigar,/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
"bxC" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module,/obj/machinery/light_switch{pixel_x = 27},/obj/structure/reagent_dispensers/acid{density = 0; pixel_y = -32},/turf/simulated/floor/tiled/white,/area/rnd/lab)