shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

and finally, the modules folder. Now I can publish and take a break

Browse Source
This commit is contained in:
deathride58
2018-07-02 01:19:37 -04:00
parent 91805b8789
commit b1688405d9
380 changed files with 2204 additions and 1588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/chronosuit.dm
+7 -7
View File
@@ -98,7 +98,7 @@
teleporting = 0
for(var/obj/item/I in user.held_items)
if(I in hands_nodrop)
I.flags_1 &= ~NODROP_1
I.item_flags &= ~NODROP
if(camera)
camera.remove_target_ui()
camera.forceMove(user)
@@ -133,9 +133,9 @@
hands_nodrop = list()
for(var/obj/item/I in user.held_items)
if(!(I.flags_1 & NODROP_1))
if(!(I.item_flags & NODROP))
hands_nodrop += I
I.flags_1 |= NODROP_1
I.item_flags |= NODROP
user.animate_movement = NO_STEPS
user.changeNext_move(8 + phase_in_ds)
user.notransform = 1
@@ -194,9 +194,9 @@
if(user.head && istype(user.head, /obj/item/clothing/head/helmet/space/chronos))
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Mounting /dev/helm")
helmet = user.head
helmet.flags_1 |= NODROP_1
helmet.item_flags |= NODROP
helmet.suit = src
src.flags_1 |= NODROP_1
src.item_flags |= NODROP
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting brainwave scanner")
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Starting ui display driver")
to_chat(user, "\[ <span style='color: #00ff00;'>ok</span> \] Initializing chronowalk4-view")
@@ -215,7 +215,7 @@
activating = 1
var/mob/living/carbon/human/user = src.loc
var/hard_landing = teleporting && force
src.flags_1 &= ~NODROP_1
item_flags &= ~NODROP
cooldown = world.time + cooldowntime * 1.5
activated = 0
activating = 0
@@ -236,7 +236,7 @@
to_chat(user, "\[ <span style='color: #ff5500;'>ok</span> \] Unmounting /dev/helmet")
to_chat(user, "logout")
if(helmet)
helmet.flags_1 &= ~NODROP_1
helmet.item_flags &= ~NODROP
helmet.suit = null
helmet = null
if(camera)
code/modules/clothing/spacesuits/flightsuit.dm
+5 -5
View File
@@ -302,7 +302,7 @@
if(suit && !suit.deployedshoes && (brake || stabilizer))
brake = FALSE
stabilizer = FALSE
usermessage("Warning: Sensor data is not being recieved from flight shoes. Stabilizers and airbrake modules deactivated!", "boldwarning")
usermessage("Warning: Sensor data is not being received from flight shoes. Stabilizers and airbrake modules deactivated!", "boldwarning")
/obj/item/flightpack/process()
@@ -897,7 +897,7 @@
usermessage("You're already wearing something on your back!", "boldwarning")
return FALSE
user.equip_to_slot_if_possible(pack,SLOT_BACK,0,0,1)
pack.flags_1 |= NODROP_1
pack.item_flags |= NODROP
resync()
user.visible_message("<span class='notice'>A [pack.name] extends from [user]'s [name] and clamps to [user.p_their()] back!</span>")
user.update_inv_wear_suit()
@@ -911,7 +911,7 @@
return FALSE
if(pack.flight && forced)
pack.disable_flight(1)
pack.flags_1 &= ~NODROP_1
pack.item_flags &= ~NODROP
resync()
if(user)
user.transferItemToLoc(pack, src, TRUE)
@@ -935,14 +935,14 @@
usermessage("You're already wearing something on your feet!", "boldwarning")
return FALSE
user.equip_to_slot_if_possible(shoes,SLOT_SHOES,0,0,1)
shoes.flags_1 |= NODROP_1
shoes.item_flags |= NODROP
user.visible_message("<span class='notice'>[user]'s [name] extends a pair of [shoes.name] over [user.p_their()] feet!</span>")
user.update_inv_wear_suit()
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
deployedshoes = TRUE
/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightshoes(forced = FALSE)
shoes.flags_1 &= ~NODROP_1
shoes.item_flags &= ~NODROP
playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1)
if(user)
user.transferItemToLoc(shoes, src, TRUE)
code/modules/clothing/spacesuits/hardsuit.dm
+1 -1
View File
@@ -713,7 +713,7 @@
icon_state = "ert_medical"
item_state = "ert_medical"
item_color = "ert_medical"
flags_1 = NODROP_1 //Dont want people changing into the other teams gear
item_flags = NODROP //Dont want people changing into the other teams gear
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/ctf
armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 95)
slowdown = 0
code/modules/clothing/spacesuits/miscellaneous.dm
+2 -2
View File
@@ -165,7 +165,7 @@ Contains:
item_color = "ert_commander"
armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
strip_delay = 130
flags_1 = NODROP_1
item_flags = NODROP
brightness_on = 7
/obj/item/clothing/suit/space/hardsuit/ert
@@ -265,7 +265,7 @@ Contains:
armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75) //As whimpy as a space carp
brightness_on = 0 //luminosity when on
actions_types = list()
flags_1 = NODROP_1
item_flags = NODROP
/obj/item/clothing/suit/space/hardsuit/carp