cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Medical belt is finally in code (made by errorage, forgotten by errorage).

Browse Source 
Pill bottles now can fit in containers (and pockets).
Moved remained adminverbs from Commands tab.
Map debugging tools tab is hidden, use verb on debug tab to show.
Singularity's EMP now won't spam in adminlog.
Revolutionaries now cannot deconvert themselves.
Cutting camera now leaves fingerprints.
Fixed some runtime errors.
Unckecked file that microvave forgot to add under svn.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1277 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-03-25 23:16:32 +00:00
parent accd8c8af8
commit 571db15490
15 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -1787,7 +1787,7 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofuburger
name = "Togu Burger"
name = "Tofu Burger"
desc = "What.. is that meat?"
icon_state = "tofuburger"
New()

33
code/defines/obj/storage.dm
View File

@@ -4,9 +4,39 @@
icon = 'belts.dmi'
icon_state = "utilitybelt"
item_state = "utility"
can_hold = list("/obj/item/weapon/crowbar","/obj/item/weapon/screwdriver","/obj/item/weapon/weldingtool","/obj/item/weapon/wirecutters","/obj/item/weapon/wrench","/obj/item/device/multitool","/obj/item/device/flashlight","/obj/item/weapon/cable_coil", "/obj/item/device/t_scanner", "/obj/item/device/analyzer")
can_hold = list(
"/obj/item/weapon/crowbar",
"/obj/item/weapon/screwdriver",
"/obj/item/weapon/weldingtool",
"/obj/item/weapon/wirecutters",
"/obj/item/weapon/wrench",
"/obj/item/device/multitool",
"/obj/item/device/flashlight",
"/obj/item/weapon/cable_coil",
"/obj/item/device/t_scanner",
"/obj/item/device/analyzer")
flags = FPRINT | TABLEPASS | ONBELT
/obj/item/weapon/storage/utilitybelt/medical
name = "medical belt"
desc = "Can hold various medical equipment."
icon_state = "medicalbelt"
item_state = "medical"
can_hold = list(
"/obj/item/device/healthanalyzer",
"/obj/item/weapon/dnainjector",
"/obj/item/weapon/reagent_containers/dropper",
"/obj/item/weapon/reagent_containers/glass/beaker",
"/obj/item/weapon/reagent_containers/glass/bottle",
"/obj/item/weapon/reagent_containers/pill",
"/obj/item/weapon/reagent_containers/syringe",
"/obj/item/weapon/reagent_containers/glass/dispenser",
"/obj/item/weapon/zippo",
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/storage/pill_bottle",
"/obj/item/weapon/medical")
flags = FPRINT | TABLEPASS | ONBELT
/obj/item/weapon/storage
icon = 'storage.dmi'
name = "storage"
@@ -26,6 +56,7 @@
icon_state = "pill_canister"
icon = 'chemical.dmi'
item_state = "contsolid"
w_class = 2.0
can_hold = list("/obj/item/weapon/reagent_containers/pill")
/obj/item/weapon/storage/box

1
code/game/machinery/camera.dm
View File

@@ -269,6 +269,7 @@
user.reset_view(src)
/obj/machinery/camera/attackby(W as obj, user as mob)
..()
if (istype(W, /obj/item/weapon/wirecutters))
src.status = !( src.status )
if (!( src.status ))

6
code/game/objects/devices/scanners.dm
View File

@@ -159,7 +159,7 @@ MASS SPECTROMETER
O.show_message(text("\red [] has analyzed []'s vitals!", user, M), 1)
//Foreach goto(67)
var/fake_oxy = max(rand(1,40), M.oxyloss, (300 - (M.toxloss + M.fireloss + M.bruteloss)))
if(M.changeling_fakedeath || M.reagents.has_reagent("zombiepowder"))
if(M.changeling_fakedeath || M.reagents && M.reagents.has_reagent("zombiepowder"))
user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1)
user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.toxloss > 50 ? "\red [M.toxloss]" : M.toxloss, M.fireloss > 50 ? "\red[M.fireloss]" : M.fireloss, M.bruteloss > 50 ? "\red[M.bruteloss]" : M.bruteloss), 1)
else
@@ -167,7 +167,7 @@ MASS SPECTROMETER
user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.oxyloss > 50 ? "\red [M.oxyloss]" : M.oxyloss, M.toxloss > 50 ? "\red [M.toxloss]" : M.toxloss, M.fireloss > 50 ? "\red[M.fireloss]" : M.fireloss, M.bruteloss > 50 ? "\red[M.bruteloss]" : M.bruteloss), 1)
user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
if(M.changeling_fakedeath || M.reagents.has_reagent("zombiepowder"))
if(M.changeling_fakedeath || M.reagents && M.reagents.has_reagent("zombiepowder"))
user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.toxloss > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.fireloss > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.bruteloss > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
else
user.show_message(text("\blue [] | [] | [] | []", M.oxyloss > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.toxloss > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.fireloss > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.bruteloss > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
@@ -175,7 +175,7 @@ MASS SPECTROMETER
user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1)
if (M.virus)
user.show_message(text("\red <b>Warning: Virus Detected.</b>\nName: [M.virus.name].\nType: [M.virus.spread].\nStage: [M.virus.stage]/[M.virus.max_stages].\nPossible Cure: [M.virus.cure]"))
if (M.reagents:get_reagent_amount("inaprovaline"))
if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1)
if (M.brainloss >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
user.show_message(text("\red Subject is brain dead."), 1)

5
code/game/objects/empulse.dm
View File

@@ -1,6 +1,7 @@
proc/empulse(turf/epicenter, heavy_range, light_range)
proc/empulse(turf/epicenter, heavy_range, light_range, nolog=0)
if(!epicenter) return
message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
if (!nolog)
message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
if (!istype(epicenter, /turf))
epicenter = epicenter.loc

2
code/game/objects/items/item.dm
View File

@@ -211,7 +211,7 @@
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
if (prob(50))
if (ticker.mode.name == "revolution")
if (ticker.mode.name == "revolution" && M != user)
ticker.mode:remove_revolutionary(H.mind)
if (b_dam && prob(25 + (b_dam * 2)))
src.add_blood(H)

2
code/game/objects/storage/storage.dm
View File

@@ -91,7 +91,7 @@
if (src.contents.len >= 7)
return
if ((W.w_class >= 3 || istype(W, /obj/item/weapon/storage) || src.loc == W))
if ((W.w_class >= 3 || (istype(W, /obj/item/weapon/storage) && !istype(W, /obj/item/weapon/storage/pill_bottle)) || src.loc == W))
return
user.u_equip(W)
W.loc = src

2
code/game/vials.dm
View File

@@ -269,6 +269,7 @@
/proc/possess(obj/O as obj in world)
set name = "Possess Obj"
set category = "Object"
usr.loc = O
usr.real_name = O.name
usr.name = O.name
@@ -277,6 +278,7 @@
/proc/release(obj/O as obj in world)
set name = "Release Obj"
set category = "Object"
//usr.loc = get_turf(usr)
usr.loc = O.loc // Appear where the object you were controlling is -- TLE
usr.client.eye = usr

21
code/modules/admin/admin_verbs.dm
View File

@@ -87,10 +87,11 @@
src.verbs += /obj/admins/proc/toggletintedweldhelmets
// Mapping helpers
src.verbs += /client/proc/do_not_use_these //-errorage
src.verbs += /client/proc/camera_view //-errorage
src.verbs += /client/proc/sec_camera_report //-errorage
src.verbs += /client/proc/intercom_view //-errorage
// src.verbs += /client/proc/do_not_use_these //-errorage
// src.verbs += /client/proc/camera_view //-errorage
// src.verbs += /client/proc/sec_camera_report //-errorage
// src.verbs += /client/proc/intercom_view //-errorage
src.verbs += /client/proc/enable_mapping_debug //-rastaf0
// Admin helpers
src.verbs += /client/proc/cmd_admin_attack_log
@@ -1061,6 +1062,13 @@
src.verbs -= /proc/givetestverbs
src.verbs -= /obj/admins/proc/spawn_atom
src.verbs -= /obj/admins/proc/toggletintedweldhelmets
src.verbs -= /client/proc/atmosscan
src.verbs -= /client/proc/restartcontroller
src.verbs -= /client/proc/enable_mapping_debug
src.verbs -= /client/proc/do_not_use_these
src.verbs -= /client/proc/camera_view
src.verbs -= /client/proc/sec_camera_report
src.verbs -= /client/proc/intercom_view
// Admin helpers
src.verbs -= /client/proc/cmd_admin_attack_log
@@ -1113,6 +1121,9 @@
src.verbs -= /obj/admins/proc/unprison
src.verbs -= /proc/togglebuildmode
src.verbs -= /client/proc/cmd_mass_modify_object_variables
src.verbs -= /client/proc/triple_ai
src.verbs -= /client/proc/only_one
// Unnecessary commands
src.verbs -= /client/proc/funbutton
src.verbs -= /client/proc/make_sound // -- TLE
@@ -1428,7 +1439,7 @@
switch (src.holder.rank)
if ("Host")
// Settings
src.verbs += /client/proc/colorooc // -- Urist
//src.verbs += /client/proc/colorooc // -- Urist
src.verbs += /obj/admins/proc/adjump //toggle admin jumping
src.verbs += /obj/admins/proc/adrev //toggle admin revives
src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning

1
code/modules/admin/verbs/adminjump.dm
View File

@@ -16,6 +16,7 @@
/client/proc/jumptoturf(var/turf/T in world)
set name = "Jump to Turf"
set category = "Admin"
if(!src.authenticated || !src.holder)
src << "Only administrators may use this command."
return

10
code/modules/admin/verbs/mapping.dm
View File

@@ -108,4 +108,12 @@ var/intercom_range_display_status = 0
for(var/turf/T in orange(7,I))
var/obj/debugging/marker/F = new/obj/debugging/marker(T)
if (!(F in view(7,I.loc)))
del(F)
del(F)
enable_mapping_debug()
set category = "Debug"
set name = "Mapping debug"
src.verbs += /client/proc/do_not_use_these //-errorage
src.verbs += /client/proc/camera_view //-errorage
src.verbs += /client/proc/sec_camera_report //-errorage
src.verbs += /client/proc/intercom_view //-errorage

2
code/modules/power/singularity/singularity.dm
View File

@@ -413,7 +413,7 @@ var/global/list/uneatable = list(
emp_area()
empulse(src, 6, 8)
empulse(src, 6, 8, nolog=1)
return

BIN
icons/mob/belt.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
icons/obj/clothing/belts.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 673 B

1
tgstation.dme
View File

@@ -206,7 +206,6 @@
#include "code\datums\spells\knock.dm"
#include "code\datums\spells\magic_missile.dm"
#include "code\datums\spells\mutate.dm"
#include "code\datums\spells\regenerate.dm"
#include "code\datums\spells\teleport.dm"
#include "code\defines\atom.dm"
#include "code\defines\client.dm"