[part] description:
[part.desc]diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index b12d6a88552..4126181ea89 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -77,8 +77,9 @@
Valve attachment: [attached_device ? "[attached_device]" : "None"] [attached_device ? "Remove" : ""]
Valve status: [ valve_open ? "Closed Open" : "Closed Open"]"} - user << browse(dat, "window=trans_valve;size=600x300") - onclose(user, "trans_valve") + var/datum/browser/popup = new(user, "trans_valve", name) + popup.set_content(dat) + popup.open() return /obj/item/device/transfer_valve/Topic(href, href_list) @@ -169,6 +170,13 @@ var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) + var/attachment = "no device" + if(attached_device) + if(istype(attached_device, /obj/item/device/assembly/signaler)) + attachment = "[attached_device]" + else + attachment = attached_device + var/attacher_name = "" if(!attacher) attacher_name = "Unknown" @@ -176,7 +184,7 @@ attacher_name = "[attacher.name]([attacher.ckey])" var/log_str1 = "Bomb valve opened in " - var/log_str2 = "with [attached_device ? attached_device : "no device"] attacher: [attacher_name]" + var/log_str2 = "with [attachment] attacher: [attacher_name]" var/log_attacher = "" if(attacher) @@ -184,14 +192,16 @@ var/mob/mob = get_mob_by_key(src.fingerprintslast) var/last_touch_info = "" - if(mob) last_touch_info = "(?)" var/log_str3 = " Last touched by: [src.fingerprintslast]" - bombers += "[log_str1] [A.name] [log_str2][log_attacher] [log_str3][last_touch_info]" - message_admins("[log_str1] [A.name] [log_str2][log_attacher] [log_str3][last_touch_info]", 0, 1) + var/bomb_message = "[log_str1] [A.name] [log_str2][log_attacher] [log_str3][last_touch_info]" + + bombers += bomb_message + + message_admins(bomb_message, 0, 1) log_game("[log_str1] [A.name]([A.x],[A.y],[A.z]) [log_str2] [log_str3]") merge_gases() spawn(20) // In case one tank bursts diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index df3e801863f..f5dc378a097 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -15,7 +15,7 @@ /obj/item/weapon/grenade/iedcasing - name = "improvised explosive assembly" + name = "improvised firebomb assembly" desc = "An igniter stuffed into an aluminium shell." w_class = 2.0 icon = 'icons/obj/grenade.dmi' @@ -29,6 +29,8 @@ active = 1 det_time = 50 display_timer = 0 + var/range = 3 + var/times = list() @@ -43,7 +45,7 @@ assembled = 1 user << "You've filled the makeshift explosive with welding fuel." playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) - desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'" + desc = "An improvised firebomb assembly. Filled to the brim with 'Firery flavor'" overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") return @@ -52,14 +54,20 @@ if(istype(I, /obj/item/stack/cable_coil)) if(assembled == 1) var/obj/item/stack/cable_coil/C = I + times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20) // "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] C.use(1) assembled = 2 user << "You wire the igniter to detonate the fuel." - desc = "A weak, improvised explosive." + desc = "A weak, improvised incendiary device." overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") - name = "improvised explosive" + name = "improvised firebomb" active = 0 - det_time = rand(30,80) + det_time = text2num(pickweight(times)) + if(det_time < 0) //checking for 'duds' + range = 1 + det_time = rand(30,80) + else + range = pick(2,2,2,3,3,3,4) /obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // if(!active) @@ -83,7 +91,7 @@ /obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up update_mob() - explosion(src.loc,-1,0,2) + explosion(src.loc,-1,-1,-1, flame_range = range) // no explosive damage, only a large fireball. qdel(src) /obj/item/weapon/grenade/iedcasing/examine() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index b51af2ded03..521945ee7fd 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -350,6 +350,21 @@ new /obj/item/weapon/card/id(src) new /obj/item/weapon/card/id(src) +/obj/item/weapon/storage/box/silver_ids + name = "box of spare silver IDs" + desc = "Shiny IDs for important people." + icon_state = "id" + + New() + ..() + new /obj/item/weapon/card/id/silver(src) + new /obj/item/weapon/card/id/silver(src) + new /obj/item/weapon/card/id/silver(src) + new /obj/item/weapon/card/id/silver(src) + new /obj/item/weapon/card/id/silver(src) + new /obj/item/weapon/card/id/silver(src) + new /obj/item/weapon/card/id/silver(src) + /obj/item/weapon/storage/box/prisoner name = "box of prisoner IDs" desc = "Take away their last shred of dignity, their name." diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 728ec9fe470..bc1466f3ba2 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -25,7 +25,7 @@ /obj/item/weapon/storage/MouseDrop(obj/over_object) - if(ismob(usr)) //all the check for item manipulation are in other places, you can safely open any storages as anything and its not buggy, i checked + if(iscarbon(usr)) //all the check for item manipulation are in other places, you can safely open any storages as anything and its not buggy, i checked var/mob/M = usr if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index bc37ba6662f..cf6061596dd 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -35,11 +35,13 @@ /obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt) if(bcell) + if(bcell.charge < (hitcost+chrgdeductamt)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. + status = 0 + update_icon() + playsound(loc, "sparks", 75, 1, -1) if(bcell.use(chrgdeductamt)) return 1 else - status = 0 - update_icon() return 0 /obj/item/weapon/melee/baton/update_icon() @@ -60,14 +62,18 @@ /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/stock_parts/cell)) - if(!bcell) + var/obj/item/weapon/stock_parts/cell/C = W + if(bcell) + user << "[src] already has a cell." + else + if(C.maxcharge < hitcost) + user << "[src] requires a higher capacity cell." + return user.drop_item() W.loc = src bcell = W user << "You install a cell in [src]." update_icon() - else - user << "[src] already has a cell." else if(istype(W, /obj/item/weapon/screwdriver)) if(bcell) @@ -86,13 +92,13 @@ status = !status user << "[src] is now [status ? "on" : "off"]." playsound(loc, "sparks", 75, 1, -1) - update_icon() else status = 0 if(!bcell) user << "[src] does not have a power source!" else user << "[src] is out of charge." + update_icon() add_fingerprint(user) /obj/item/weapon/melee/baton/attack(mob/M, mob/user) @@ -158,4 +164,4 @@ throwforce = 5 stunforce = 5 hitcost = 2500 - slot_flags = null \ No newline at end of file + slot_flags = null diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 385115c97a8..877d943f1bc 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -173,7 +173,7 @@ if(affecting.status == ORGAN_ROBOTIC) if(src.remove_fuel(0)) - src.item_heal_robotic(H, user, 30, 0) + item_heal_robotic(H, user, 30, 0) return else user << "Need more welding fuel!" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 185310e5e80..eac0742b489 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -197,7 +197,7 @@ New() ..() sleep(2) - new /obj/item/clothing/under/det(src) + new /obj/item/clothing/under/rank/det(src) new /obj/item/clothing/suit/det_suit(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/head/det_hat(src) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 32f8c739a20..50a4c2579cb 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -240,10 +240,6 @@ return else - if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear))) - usr << "You get the feeling that you shouldn't cremate one of the items in the cremator." - return - for (var/mob/M in viewers(src)) M.show_message("\red You hear a roar as the crematorium activates.", 1) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 7f743f88f04..22b54fe0015 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -2,6 +2,7 @@ icon = 'icons/turf/space.dmi' name = "\proper space" icon_state = "0" + intact = 0 temperature = TCMB thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT @@ -62,35 +63,17 @@ qdel(A) return - if(istype(A, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks travel Z levels ... And moving this shit down here so it only fires when they're actually trying to change z-level. - qdel(A) //The disk's Del() proc ensures a new one is created - return - - var/list/disk_search = A.search_contents_for(/obj/item/weapon/disk/nuclear) - if(!isemptylist(disk_search)) - if(istype(A, /mob/living)) - var/mob/living/MM = A - if(MM.client && !MM.stat) - MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is." - if(MM.x <= TRANSITIONEDGE) - MM.inertia_dir = 4 - else if(MM.x >= world.maxx -TRANSITIONEDGE) - MM.inertia_dir = 8 - else if(MM.y <= TRANSITIONEDGE) - MM.inertia_dir = 1 - else if(MM.y >= world.maxy -TRANSITIONEDGE) - MM.inertia_dir = 2 - else - for(var/obj/item/weapon/disk/nuclear/N in disk_search) - qdel(N)//Make the disk respawn it is on a clientless mob or corpse - else - for(var/obj/item/weapon/disk/nuclear/N in disk_search) - qdel(N)//Make the disk respawn if it is floating on its own - return - var/move_to_z = src.z var/safety = 1 + //Check if it's a mob pulling an object + var/atom/movable/was_pulling = null + var/mob/living/MOB = null + if(isliving(A)) + MOB = A + if(MOB.pulling) + was_pulling = MOB.pulling //Store the object to transition later + while(move_to_z == src.z) var/move_to_z_str = pickweight(accessable_z_levels) move_to_z = text2num(move_to_z_str) @@ -119,10 +102,10 @@ A.y = TRANSITIONEDGE + 1 A.x = rand(TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 2) - - - spawn (0) + if(was_pulling && MOB) //Carry the object they were pulling over when they transition + was_pulling.loc = MOB.loc + MOB.start_pulling(was_pulling) if ((A && A.loc)) A.loc.Entered(A) @@ -236,4 +219,4 @@ return /turf/space/handle_slip() - return \ No newline at end of file + return diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 0073ac1f40f..86afb10a045 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -106,20 +106,15 @@ var/loopsanity = 100 if(ismob(M)) - if(!M:lastarea) - M:lastarea = get_area(M.loc) - if(!has_gravity(M)) - inertial_drift(M) - - /* - if(M.flags & NOGRAV) - inertial_drift(M) - */ - - - + var/mob/O = M + if(!O.lastarea) + O.lastarea = get_area(O.loc) + var/has_gravity = O.mob_has_gravity(src) + O.update_gravity(has_gravity) + if(!has_gravity) + inertial_drift(O) else if(!istype(src, /turf/space)) - M:inertia_dir = 0 + O.inertia_dir = 0 ..() var/objects = 0 for(var/atom/A as mob|obj|turf|area in range(1)) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b15af9b48cc..0be71e2376b 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -703,7 +703,7 @@ var/global/list/g_fancy_list_of_safe_types = null if ("tournament gangster") //gangster are supposed to fight each other. --rastaf0 - M.equip_to_slot_or_del(new /obj/item/clothing/under/det(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/det(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(M), slot_wear_suit) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index e61d2c50885..f79e4e09cd7 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -5,15 +5,24 @@ m_amt = 500 g_amt = 50 origin_tech = "magnets=1" + var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread + +/obj/item/device/assembly/igniter/New() + ..() + sparks.set_up(2, 0, src) + sparks.attach(src) + + +/obj/item/device/assembly/igniter/activate() + if(!..()) return 0//Cooldown check + var/turf/location = get_turf(loc) + if(location) location.hotspot_expose(1000,1000) + sparks.start() + return 1 + + +/obj/item/device/assembly/igniter/attack_self(mob/user as mob) activate() - if(!..()) return 0//Cooldown check - var/turf/location = get_turf(loc) - if(location) location.hotspot_expose(1000,1000) - return 1 - - - attack_self(mob/user as mob) - activate() - add_fingerprint(user) - return \ No newline at end of file + add_fingerprint(user) + return \ No newline at end of file diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index b7a1a5ef3f8..cf654c56c83 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -11,98 +11,103 @@ var/timing = 0 var/time = 5 - proc - timer_end() - describe() - if(timing) - return "The timer is counting down from [time]!" - return "The timer is set for [time] seconds." - - activate() - if(!..()) return 0//Cooldown check - timing = !timing - update_icon() - return 0 - - - toggle_secure() - secured = !secured - if(secured) - processing_objects.Add(src) - else - timing = 0 - processing_objects.Remove(src) - update_icon() - return secured - - - timer_end() - if((!secured)||(cooldown > 0)) return 0 - pulse(0) - visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") - cooldown = 2 - spawn(10) - process_cooldown() - return - - - process() - if(timing && (time > 0)) - time-- - if(timing && time <= 0) - timing = 0 - timer_end() - time = initial(time) - return +/obj/item/device/assembly/timer/describe() + if(timing) + return "The timer is counting down from [time]!" + return "The timer is set for [time] seconds." +/obj/item/device/assembly/timer/activate() + if(!..()) return 0//Cooldown check + timing = !timing update_icon() - overlays.Cut() - attached_overlays = list() - if(timing) - overlays += "timer_timing" - attached_overlays += "timer_timing" - if(holder) - holder.update_icon() + return 0 + + +/obj/item/device/assembly/timer/toggle_secure() + secured = !secured + if(secured) + processing_objects.Add(src) + else + timing = 0 + processing_objects.Remove(src) + update_icon() + return secured + + +/obj/item/device/assembly/timer/proc/timer_end() + if((!secured)||(cooldown > 0)) return 0 + pulse(0) + visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + cooldown = 2 + spawn(10) + process_cooldown() + return + + +/obj/item/device/assembly/timer/process() + if(timing && (time > 0)) + time-- + if(timing && time <= 0) + timing = 0 + timer_end() + time = initial(time) + return + + +/obj/item/device/assembly/timer/update_icon() + overlays.Cut() + attached_overlays = list() + if(timing) + overlays += "timer_timing" + attached_overlays += "timer_timing" + if(holder) + holder.update_icon() + return + + +/obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires + if(!secured) + user.show_message("\red The [name] is unsecured!") + return 0 + var/second = time % 60 + var/minute = (time - second) / 60 + var/dat = text("Timing Unit\n[] []:[]\n- - + +\n", (timing ? text("Timing", src) : text("Not Timing", src)), minute, second, src, src, src, src) + dat += "
Refresh" + dat += "
Close" + var/datum/browser/popup = new(user, "timer", name) + popup.set_content(dat) + popup.open() + return + + +/obj/item/device/assembly/timer/Topic(href, href_list) + ..() + if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + usr << browse(null, "window=timer") + onclose(usr, "timer") return + if(href_list["time"]) + timing = text2num(href_list["time"]) + if(timing && istype(holder, /obj/item/device/transfer_valve)) + var/timer_message = "[key_name_admin(usr)](?) activated [src] attachment on [holder]." + message_admins(timer_message) + bombers += timer_message + log_game("[key_name(usr)] activated [src] attachment for [loc]") + update_icon() - interact(mob/user as mob)//TODO: Have this use the wires - if(!secured) - user.show_message("\red The [name] is unsecured!") - return 0 - var/second = time % 60 - var/minute = (time - second) / 60 - var/dat = text("Timing Unit\n[] []:[]\n- - + +\n", (timing ? text("Timing", src) : text("Not Timing", src)), minute, second, src, src, src, src) - dat += "
Refresh" - dat += "
Close" - user << browse(dat, "window=timer") - onclose(user, "timer") + if(href_list["tp"]) + var/tp = text2num(href_list["tp"]) + time += tp + time = min(max(round(time), 1), 600) + + if(href_list["close"]) + usr << browse(null, "window=timer") return + if(usr) + attack_self(usr) - Topic(href, href_list) - ..() - if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) - usr << browse(null, "window=timer") - onclose(usr, "timer") - return - - if(href_list["time"]) - timing = text2num(href_list["time"]) - update_icon() - - if(href_list["tp"]) - var/tp = text2num(href_list["tp"]) - time += tp - time = min(max(round(time), 1), 600) - - if(href_list["close"]) - usr << browse(null, "window=timer") - return - - if(usr) - attack_self(usr) - - return + return diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 9c8d10a3921..4245bf5e056 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -119,15 +119,6 @@ obj/machinery/gateway/centerstation/process() if(!active) return if(!awaygate) return - if(istype(M, /obj/item/weapon/disk/nuclear)) - return - - if(M.GetTypeInAllContents(/obj/item/weapon/disk/nuclear)) - if(ismob(M)) - var/mob/MOB = M - MOB << "You are forbidden from taking the nuclear authentication disk off station." - return - if(awaygate.calibrated) M.loc = get_step(awaygate.loc, SOUTH) M.dir = SOUTH diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index afe5dd34ab9..99265d6cf6f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -97,6 +97,9 @@ BLIND // can't see anything permeability_coefficient = 0.50 slowdown = SHOES_SLOWDOWN +/obj/item/proc/negates_gravity() + return 0 + //Suit /obj/item/clothing/suit icon = 'icons/obj/clothing/suits.dmi' diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index b7a2e50ea42..8b22d9da546 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -160,7 +160,7 @@ if("*Arrest*") holder.icon_state = "hudwanted" if("Incarcerated") holder.icon_state = "hudincarcerated" if("Parolled") holder.icon_state = "hudparolled" - if("Released") holder.icon_state = "hudreleased" + if("Discharged") holder.icon_state = "huddischarged" else continue C.images += holder \ No newline at end of file diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 81f93572029..cb1665dea93 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -17,6 +17,7 @@ on = !on icon_state = "hardhat[on]_[item_color]" item_state = "hardhat[on]_[item_color]" + user.update_inv_head() //so our mob-overlays update if(on) user.AddLuminosity(brightness_on) else user.AddLuminosity(-brightness_on) diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index ef61321a694..5cfc7441638 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -3,6 +3,7 @@ name = "breath mask" icon_state = "breath" item_state = "m_mask" + body_parts_covered = 0 flags = MASKCOVERSMOUTH | MASKINTERNALS w_class = 2 gas_transfer_coefficient = 0.10 @@ -13,4 +14,4 @@ name = "medical mask" icon_state = "medical" item_state = "m_mask" - permeability_coefficient = 0.01 \ No newline at end of file + permeability_coefficient = 0.01 diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 2900a5dc63d..5b359700790 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -26,7 +26,10 @@ icon_state = "[magboot_state][magpulse]" user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system." user.update_inv_shoes(0) //so our mob-overlays update + user.update_gravity(user.mob_has_gravity()) +/obj/item/clothing/shoes/magboots/negates_gravity() + return flags & NOSLIP /obj/item/clothing/shoes/magboots/examine() set src in view() diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 897fa1f2604..4cd96431909 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -132,14 +132,14 @@ item_state = "ba_suit" item_color = "blacksuit" -/obj/item/clothing/under/librarian +/obj/item/clothing/under/rank/librarian name = "sensible suit" desc = "It's very... sensible." icon_state = "red_suit" item_state = "red_suit" item_color = "red_suit" -/obj/item/clothing/under/mime +/obj/item/clothing/under/rank/mime name = "mime's outfit" desc = "It's not very colourful." icon_state = "mime" @@ -151,4 +151,4 @@ name = "shaft miner's jumpsuit" icon_state = "miner" item_state = "miner" - item_color = "miner" \ No newline at end of file + item_color = "miner" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 13f1825d0c2..f3d30507fdc 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -28,7 +28,7 @@ /* * Detective */ -/obj/item/clothing/under/det +/obj/item/clothing/under/rank/det name = "hard-worn suit" desc = "Someone who wears this means business." icon_state = "detective" @@ -88,4 +88,4 @@ name = "warden's uniform" icon_state = "wardenblueclothes" item_state = "wardenblueclothes" - item_color = "wardenblueclothes" \ No newline at end of file + item_color = "wardenblueclothes" diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index d2e142326c5..ae4e07094ed 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -12,7 +12,7 @@ var/ionMessage = null var/ionAnnounceChance = 33 -/datum/round_event/ion_storm/New(var/bogEmagChance = 10, var/announceEvent = ION_RANDOM, var/ionMessage = null, var/ionAnnounceChance = 33) +/datum/round_event/ion_storm/New(var/botEmagChance = 10, var/announceEvent = ION_RANDOM, var/ionMessage = null, var/ionAnnounceChance = 33) src.botEmagChance = botEmagChance src.announceEvent = announceEvent src.ionMessage = ionMessage diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index b3fd33506d8..3273faf0497 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -188,6 +188,10 @@ /mob/living/carbon/alien/getTrail() return "xltrails" +/mob/living/carbon/alien/cuff_break(obj/item/I, mob/living/carbon/C) + playsound(C, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when breaking free. + ..() + /*---------------------------------------- Proc: AddInfectionImages() Des: Gives the client of the alien an image on each infected mob. diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 0f7690a1a4d..ea0cc16a2d5 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -6,28 +6,8 @@ usr << "Something is there but you can't see it." return - var/skipgloves = 0 - var/skipsuitstorage = 0 - var/skipjumpsuit = 0 - var/skipshoes = 0 - var/skipmask = 0 - var/skipears = 0 - var/skipeyes = 0 + var/list/obscured = check_obscured_slots() var/skipface = 0 - - //exosuits and helmets obscure our view and stuff. - if(wear_suit) - skipgloves = wear_suit.flags_inv & HIDEGLOVES - skipsuitstorage = wear_suit.flags_inv & HIDESUITSTORAGE - skipjumpsuit = wear_suit.flags_inv & HIDEJUMPSUIT - skipshoes = wear_suit.flags_inv & HIDESHOES - - if(head) - skipmask = head.flags_inv & HIDEMASK - skipeyes = head.flags_inv & HIDEEYES - skipears = head.flags_inv & HIDEEARS - skipface = head.flags_inv & HIDEFACE - if(wear_mask) skipface |= wear_mask.flags_inv & HIDEFACE @@ -40,7 +20,7 @@ var/msg = "*---------*\nThis is " - if( skipjumpsuit && skipface ) //big suits/masks/helmets make it hard to tell their gender + if( slot_w_uniform in obscured && skipface ) //big suits/masks/helmets make it hard to tell their gender t_He = "They" t_his = "their" t_him = "them" @@ -62,7 +42,7 @@ msg += "[src.name]!\n" //uniform - if(w_uniform && !skipjumpsuit) + if(w_uniform && !(slot_w_uniform in obscured)) //Ties var/tie_msg if(istype(w_uniform,/obj/item/clothing/under)) @@ -90,7 +70,7 @@ msg += "[t_He] [t_is] wearing \icon[wear_suit] \a [wear_suit].\n" //suit/armour storage - if(s_store && !skipsuitstorage) + if(s_store) if(s_store.blood_DNA) msg += "[t_He] [t_is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] blood-stained [s_store.name] on [t_his] [wear_suit.name]!\n" else @@ -118,7 +98,7 @@ msg += "[t_He] [t_is] holding \icon[r_hand] \a [r_hand] in [t_his] right hand.\n" //gloves - if(gloves && !skipgloves) + if(gloves && !(slot_gloves in obscured)) if(gloves.blood_DNA) msg += "[t_He] [t_has] \icon[gloves] [gloves.gender==PLURAL?"some":"a"] blood-stained [gloves.name] on [t_his] hands!\n" else @@ -143,28 +123,28 @@ msg += "[t_He] [t_has] \icon[belt] \a [belt] about [t_his] waist.\n" //shoes - if(shoes && !skipshoes) + if(shoes && !(slot_shoes in obscured)) if(shoes.blood_DNA) msg += "[t_He] [t_is] wearing \icon[shoes] [shoes.gender==PLURAL?"some":"a"] blood-stained [shoes.name] on [t_his] feet!\n" else msg += "[t_He] [t_is] wearing \icon[shoes] \a [shoes] on [t_his] feet.\n" //mask - if(wear_mask && !skipmask) + if(wear_mask && !(slot_wear_mask in obscured)) if(wear_mask.blood_DNA) msg += "[t_He] [t_has] \icon[wear_mask] [wear_mask.gender==PLURAL?"some":"a"] blood-stained [wear_mask.name] on [t_his] face!\n" else msg += "[t_He] [t_has] \icon[wear_mask] \a [wear_mask] on [t_his] face.\n" //eyes - if(glasses && !skipeyes) + if(glasses && !(slot_glasses in obscured)) if(glasses.blood_DNA) msg += "[t_He] [t_has] \icon[glasses] [glasses.gender==PLURAL?"some":"a"] blood-stained [glasses] covering [t_his] eyes!\n" else msg += "[t_He] [t_has] \icon[glasses] \a [glasses] covering [t_his] eyes.\n" //ears - if(ears && !skipears) + if(ears && !(slot_ears in obscured)) msg += "[t_He] [t_has] \icon[ears] \a [ears] on [t_his] ears.\n" //ID diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 95ca9cf0f7c..7030742e370 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -292,54 +292,81 @@ /mob/living/carbon/human/show_inv(mob/user) user.set_machine(src) var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask) + var/list/obscured = check_obscured_slots() + var/dat = {" -
- [name] -
-
Mask: [(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Nothing"] -
Left Hand: [(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Nothing"] -
Right Hand: [(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Nothing"] -
Gloves: [(gloves && !(gloves.flags&ABSTRACT)) ? gloves : "Nothing"] -
Eyes: [(glasses && !(glasses.flags&ABSTRACT)) ? glasses : "Nothing"] -
Ears: [(ears && !(ears.flags&ABSTRACT)) ? ears : "Nothing"] -
Head: [(head && !(head.flags&ABSTRACT)) ? head : "Nothing"] -
Shoes: [(shoes && !(shoes.flags&ABSTRACT)) ? shoes : "Nothing"]"} + Left Hand: [(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Empty"]
+ Right Hand: [(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Empty"]
+ "} - dat += "
Uniform: [(w_uniform && !(w_uniform.flags&ABSTRACT)) ? w_uniform : "Nothing"]" - if(w_uniform) - dat += "
Belt: [(belt && !(belt.flags&ABSTRACT)) ? belt : "Nothing"]" - if(has_breathable_mask && istype(belt, /obj/item/weapon/tank)) - dat += "
[internal ? "Disable Internals" : "Set Internals"]" - - dat += "
Exosuit: [(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Nothing"]" - if(wear_suit) - dat += "
Suit Storage: [(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "Nothing"]" - if(has_breathable_mask && istype(wear_suit, /obj/item/weapon/tank)) - dat += "
[internal ? "Disable Internals" : "Set Internals"]" - - dat += "
Back: [(back && !(back.flags&ABSTRACT)) ? back : "Nothing"]" + dat += "
Back: [(back && !(back.flags&ABSTRACT)) ? back : "Empty"]" if(has_breathable_mask && istype(back, /obj/item/weapon/tank)) - dat += "
[internal ? "Disable Internals" : "Set Internals"]" + dat += "
[TAB]↳[internal ? "Disable Internals" : "Set Internals"]" - if(w_uniform) //we checked already, but a different place. - dat += "
ID: [(wear_id && !(wear_id.flags&ABSTRACT)) ? wear_id : "Nothing"]" + dat += "
" + + dat += "
Head: [(head && !(head.flags&ABSTRACT)) ? head : "Empty"]" + + if(slot_wear_mask in obscured) + dat += "
Mask: Obscured by [head]" + else + dat += "
Mask: [(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"]" + + if(slot_glasses in obscured) + dat += "
Eyes: Obscured by [head]" + else + dat += "
Eyes: [(glasses && !(glasses.flags&ABSTRACT)) ? glasses : "Empty"]" + + if(slot_ears in obscured) + dat += "
Ears: Obscured by [head]" + else + dat += "
Ears: [(ears && !(ears.flags&ABSTRACT)) ? ears : "Empty"]" + + dat += "
" + + dat += "
Exosuit: [(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Empty"]" + if(wear_suit) + dat += "
[TAB]↳Suit Storage: [(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "Empty"]" + if(has_breathable_mask && istype(wear_suit, /obj/item/weapon/tank)) + dat += "
[TAB][TAB]↳[internal ? "Disable Internals" : "Set Internals"]" + + if(slot_shoes in obscured) + dat += "
Shoes: Obscured by [wear_suit]" + else + dat += "
Shoes: [(shoes && !(shoes.flags&ABSTRACT)) ? shoes : "Empty"]" + + if(slot_gloves in obscured) + dat += "
Gloves: Obscured by [wear_suit]" + else + dat += "
Gloves: [(gloves && !(gloves.flags&ABSTRACT)) ? gloves : "Empty"]" + + if(slot_w_uniform in obscured) + dat += "
Uniform: Obscured by [wear_suit]" + else + dat += "
Uniform: [(w_uniform && !(w_uniform.flags&ABSTRACT)) ? w_uniform : "Empty"]" + if(w_uniform) + dat += "
[TAB]↳Belt: [(belt && !(belt.flags&ABSTRACT)) ? belt : "Empty"]" + if(has_breathable_mask && istype(belt, /obj/item/weapon/tank)) + dat += "
[TAB][TAB]↳[internal ? "Disable Internals" : "Set Internals"]" + dat += "
[TAB]↳Pockets: [(l_store && !(l_store.flags&ABSTRACT)) ? "Left (Full)" : "Left (Empty)"]" + dat += " [(r_store && !(r_store.flags&ABSTRACT)) ? "Right (Full)" : "Right (Empty)"]" + dat += "
[TAB]↳ID: [(wear_id && !(wear_id.flags&ABSTRACT)) ? wear_id : "Empty"]" + + dat += "
" if(handcuffed) - dat += "
Handcuffed" + dat += "
Handcuffed: Remove" if(legcuffed) - dat += "
Legcuffed" - if(w_uniform) - dat += "
Left Pocket ([(l_store && !(l_store.flags&ABSTRACT)) ? "Full" : "Empty"])" - dat += " - Right Pocket ([(r_store && !(r_store.flags&ABSTRACT)) ? "Full" : "Empty"])" + dat += "
Legcuffed: Remove" dat += {"
Close "} - user << browse(dat, "window=mob\ref[src];size=340x480") - onclose(user, "mob\ref[src]") - + var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 340, 500) + popup.set_content(dat) + popup.open() // called when something steps onto a human // this could be made more general, but for now just handle mulebot @@ -358,11 +385,14 @@ /mob/living/carbon/human/Topic(href, href_list) - ..() - //strip panel - if(!usr.stat && usr.canmove && !usr.restrained() && in_range(src, usr)) - if(href_list["pockets"]) + if(usr.canUseTopic(src)) + if(href_list["item"]) + var/slot = text2num(href_list["item"]) + if(slot in check_obscured_slots()) + usr << "You can't reach that. Something is covering it." + return + if(href_list["pockets"]) var/pocket_side = href_list["pockets"] var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store) var/obj/item/pocket_item = (pocket_id == slot_r_store ? src.r_store : src.l_store) @@ -390,13 +420,14 @@ // Update strip window if(usr.machine == src && in_range(src, usr)) show_inv(usr) - - - else // Display a warning if the user mocks up src << "You feel your [pocket_side] pocket being fumbled with!" + ..() + return + + if(href_list["criminal"]) if(istype(usr, /mob/living/carbon/human)) var/mob/living/carbon/human/H = usr @@ -425,7 +456,7 @@ if(perpname) var/datum/data/record/R = find_record("name", perpname, data_core.security) if(R) - var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel") + var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Discharged", "Cancel") if(R) if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses)) if(setcriminal != "Cancel") @@ -461,4 +492,28 @@ . = 0 if(!. && error_msg && user) // Might need re-wording. - user << "There is no exposed flesh or thin material [above_neck(target_zone) ? "on their head" : "on their body"]." \ No newline at end of file + user << "There is no exposed flesh or thin material [above_neck(target_zone) ? "on their head" : "on their body"]." + +/mob/living/carbon/human/proc/check_obscured_slots() + var/list/obscured = list() + + if(wear_suit) + if(wear_suit.flags_inv & HIDEGLOVES) + obscured |= slot_gloves + if(wear_suit.flags_inv & HIDEJUMPSUIT) + obscured |= slot_w_uniform + if(wear_suit.flags_inv & HIDESHOES) + obscured |= slot_shoes + + if(head) + if(head.flags_inv & HIDEMASK) + obscured |= slot_wear_mask + if(head.flags_inv & HIDEEYES) + obscured |= slot_glasses + if(head.flags_inv & HIDEEARS) + obscured |= slot_ears + + if(obscured.len > 0) + return obscured + else + return null diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 52ee1282aa9..905c9adaf4d 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -38,11 +38,6 @@ if(((!check_drift) || (check_drift && J.stabilization_on)) && (!lying) && (J.allow_thrust(0.01, src))) inertia_dir = 0 return 1 - //Do we have working magboots - if(istype(shoes, /obj/item/clothing/shoes/magboots)) - var/obj/item/clothing/shoes/magboots/B = shoes - if((B.flags & NOSLIP) && istype(src.loc,/turf/simulated/floor) && (!has_gravity(src.loc))) - return 1 //If no working jetpack or magboots then use the other checks if(..()) return 1 return 0 @@ -70,4 +65,13 @@ /mob/living/carbon/human/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) if(isobj(shoes) && (shoes.flags&NOSLIP) && !(lube&GALOSHES_DONT_HELP)) return 0 - .=..() \ No newline at end of file + .=..() + +/mob/living/carbon/human/mob_has_gravity() + . = ..() + if(!.) + if(mob_negates_gravity()) + . = 1 + +/mob/living/carbon/human/mob_negates_gravity() + return shoes && shoes.negates_gravity() diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 3dc89883751..3cfb35adffc 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -437,11 +437,20 @@ if (Victim) // We are asked to stop feeding if (Friends[who] > 4) Victim = null + Target = null if (Friends[who] < 7) --Friends[who] to_say = "Grrr..." // I'm angry but I do it else to_say = "Fine..." + else if (Target) // We are asked to stop chasing + if (Friends[who] > 3) + Target = null + if (Friends[who] < 6) + --Friends[who] + to_say = "Grrr..." // I'm angry but I do it + else + to_say = "Fine..." else if (Leader) // We are asked to stop following if (Leader == who) to_say = "Yes... I'll stay..." diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 5b326beb517..707e55f0602 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -421,6 +421,62 @@ /mob/living/proc/getTrail() //silicon and simple_animals don't get blood trails return null +/mob/living/proc/cuff_break(obj/item/I, mob/living/carbon/C) + + if(HULK in usr.mutations) + C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) + + C.visible_message("[C] manages to break [I]!", \ + "You successfully break [I].") + qdel(I) + + if(C.handcuffed) + C.update_inv_handcuffed(0) + C.handcuffed = null + else + C.update_inv_legcuffed(0) + C.legcuffed = null + + +/mob/living/proc/cuff_resist(obj/item/I, mob/living/carbon/C) + var/breakouttime = 600 + var/displaytime = 1 + if(istype(I, /obj/item/weapon/handcuffs)) + var/obj/item/weapon/handcuffs/HC = C.handcuffed + breakouttime = HC.breakouttime + else if(istype(I, /obj/item/weapon/legcuffs)) + var/obj/item/weapon/legcuffs/LC = C.legcuffed + breakouttime = LC.breakouttime + displaytime = breakouttime / 600 + + if(isalienadult(C) || HULK in usr.mutations) + C.visible_message("[C] is trying to break [I]!", \ + "You attempt to break [I]. (This will take around 5 seconds and you need to stand still.)") + spawn(0) + if(do_after(C, 50)) + if(!I || C.buckled) + return + cuff_break(I, C) + else + + C.visible_message("[usr] attempts to remove [I]!", \ + "You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)") + spawn(0) + if(do_after(C, breakouttime)) + if(!I || C.buckled) + return + C.visible_message("[C] manages to remove [I]!", \ + "You successfully remove [I].") + + if(C.handcuffed) + C.handcuffed.loc = usr.loc + C.update_inv_handcuffed(0) + C.handcuffed = null + else + C.legcuffed.loc = usr.loc + C.update_inv_legcuffed(0) + C.legcuffed = null + /mob/living/verb/resist() set name = "Resist" set category = "IC" @@ -495,74 +551,14 @@ "You extinguish yourself.") ExtinguishMob() return - if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time)) - CM.changeNext_move(100) - CM.last_special = world.time + 100 - if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here. - CM.visible_message("[CM] is trying to break [CM.handcuffed]!", \ - "You attempt to break [CM.handcuffed]. (This will take around 5 seconds and you need to stand still.)") - spawn(0) - if(do_after(CM, 50)) - if(!CM.handcuffed || CM.buckled) - return - CM.visible_message("[CM] manages to break [CM.handcuffed]!" , \ - "You successfully break [CM.handcuffed]!") - CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - qdel(CM.handcuffed) - CM.handcuffed = null - CM.update_inv_handcuffed(0) - else - var/obj/item/weapon/handcuffs/HC = CM.handcuffed - var/breakouttime = 600 //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type - var/displaytime = 2 //Minutes to display in the "this will take X minutes." - if(istype(HC)) //If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future... - breakouttime = HC.breakouttime - displaytime = breakouttime / 600 //Minutes - CM.visible_message("[usr] attempts to remove [HC]!", \ - "You attempt to remove [HC]. (This will take around [displaytime] minutes and you need to stand still.)") - spawn(0) - if(do_after(CM, breakouttime)) - if(!CM.handcuffed || CM.buckled) - return // time leniency for lag which also might make this whole thing pointless but the server - CM.visible_message("[CM] manages to remove [CM.handcuffed]!", \ - "You successfully remove [CM.handcuffed].") - CM.handcuffed.loc = usr.loc - CM.handcuffed = null - CM.update_inv_handcuffed(0) - else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time)) - CM.changeNext_move(100) - CM.last_special = world.time + 100 - if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here. - CM.visible_message("[CM] is trying to break [CM.legcuffed]!", \ - "You attempt to break [CM.legcuffed]. (This will take around 5 seconds and you need to stand still.)") - spawn(0) - if(do_after(CM, 50)) - if(!CM.legcuffed || CM.buckled) - return - CM.visible_message("[CM] manages to break [CM.legcuffed]!", \ - "You successfully break [CM.legcuffed].") - CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - qdel(CM.legcuffed) - CM.legcuffed = null - CM.update_inv_legcuffed(0) - else - var/obj/item/weapon/legcuffs/HC = CM.legcuffed - var/breakouttime = 600 //A default in case you are somehow legcuffed with something that isn't an obj/item/weapon/legcuffs type - var/displaytime = 2 //Minutes to display in the "this will take X minutes." - if(istype(HC)) //If you are legcuffed with actual legcuffs... Well what do I know, maybe someone will want to legcuff you with toilet paper in the future... - breakouttime = HC.breakouttime - displaytime = breakouttime / 600 //Minutes - CM.visible_message("[CM] attempts to remove [HC]!", \ - "You attempt to remove [HC]. (This will take around [displaytime] minutes and you need to stand still.)") - spawn(0) - if(do_after(CM, breakouttime)) - if(!CM.legcuffed || CM.buckled) - return //time leniency for lag which also might make this whole thing pointless but the server - CM.visible_message("[CM] manages to remove [CM.legcuffed]!", \ - "You successfully remove [CM.legcuffed].") - CM.legcuffed.loc = usr.loc - CM.legcuffed = null - CM.update_inv_legcuffed(0) + if(CM.canmove && (CM.last_special <= world.time)) + if(CM.handcuffed || CM.legcuffed) + CM.changeNext_move(100) + CM.last_special = world.time + 100 + if(CM.handcuffed) + cuff_resist(CM.handcuffed, CM) + else + cuff_resist(CM.legcuffed, CM) /mob/living/proc/get_visible_name() @@ -581,13 +577,26 @@ src << "You're too exhausted to keep going..." Weaken(5) +/mob/living/update_gravity(has_gravity) + if(!ticker) + return + float(!has_gravity) + +/mob/living/proc/float(on) + if(on && !floating) + animate(src, pixel_y = 2, time = 10, loop = -1) + floating = 1 + else if(!on && floating) + animate(src, pixel_y = initial(pixel_y), time = 10) + floating = 0 + // The src mob is trying to strip an item from someone // Override if a certain type of mob should be behave differently when stripping items (can't, for example) /mob/living/stripPanelUnequip(mob/who, obj/item/what, where) if(what.flags & NODROP) src << "You can't remove \the [what.name], it appears to be stuck!" return - visible_message("[src] tries to remove [who]'s [what.name].", \ + who.visible_message("[src] tries to remove [who]'s [what.name].", \ "[src] tries to remove [who]'s [what.name].") what.add_fingerprint(src) if(do_mob(src, who, STRIP_DELAY)) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 6169a45d459..a1de3adb051 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -37,3 +37,4 @@ var/fire_stacks = 0 //Tracks how many stacks of fire we have on, max is usually 20 var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always + var/floating = 0 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 8036721f0cc..f32dba73748 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -39,6 +39,7 @@ var/list/ai_list = list() var/control_disabled = 0 // Set to 1 to stop AI from interacting via Click() var/malfhacking = 0 // More or less a copy of the above var, so that malf AIs can hack and still get new cyborgs -- NeoFite + var/malf_cooldown = 0 //Cooldown var for malf modules var/obj/machinery/power/apc/malfhack = null var/explosive = 0 //does the AI explode when it dies? diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm index 07ea2fbc9e1..0bee9366e80 100644 --- a/code/modules/mob/living/silicon/pai/hud.dm +++ b/code/modules/mob/living/silicon/pai/hud.dm @@ -24,7 +24,7 @@ if("*Arrest*") holder.icon_state = "hudwanted" if("Incarcerated") holder.icon_state = "hudincarcerated" if("Parolled") holder.icon_state = "hudparolled" - if("Released") holder.icon_state = "hudreleased" + if("Discharged") holder.icon_state = "huddischarged" else return client.images += holder diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index de4d774d53a..b93c622b752 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -46,4 +46,5 @@ /mob/living/simple_animal/hostile/retaliate/adjustBruteLoss(var/damage) ..(damage) - Retaliate() + if(stat == CONSCIOUS) + Retaliate() diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 0be6049403b..d5f8f2f907a 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -41,7 +41,8 @@ /mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri if(istype(O, /obj/item/device/soulstone)) - O.transfer_soul("SHADE", src, user) + var/obj/item/device/soulstone/SS = O + SS.transfer_soul("SHADE", src, user) else ..() return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ea8ff8040f2..e295e0b6553 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -418,4 +418,28 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h /proc/get_both_hands(mob/living/carbon/M) var/list/hands = list(M.l_hand, M.r_hand) - return hands \ No newline at end of file + return hands + +/proc/item_heal_robotic(var/mob/living/carbon/human/H, var/mob/user, var/brute, var/burn) + var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) + + var/dam //changes repair text based on how much brute/burn was supplied + + if(brute > burn) + dam = 1 + else + dam = 0 + + if(affecting.status == ORGAN_ROBOTIC) + if(brute > 0 && affecting.brute_dam > 0 || burn > 0 && affecting.burn_dam > 0) + affecting.heal_damage(brute,burn,1) + H.update_damage_overlays(0) + H.updatehealth() + for(var/mob/O in viewers(user, null)) + O.show_message(text("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!"), 1) + return + else + user << "[H]'s [affecting.getDisplayName()] is already in good condition" + return + else + return \ No newline at end of file diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 768a451c616..23bea151de0 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -362,9 +362,8 @@ if(istype(turf,/turf/space)) continue - else - if((istype(turf,/turf/simulated/floor)) && (!has_gravity(src))) // No one else gets a chance. - continue + if(!turf.density && !mob_negates_gravity()) + continue dense_object++ break @@ -385,18 +384,22 @@ if(!dense_object) return 0 - - //Check to see if we slipped if(prob(Process_Spaceslipping(5))) src << "\blue You slipped!" src.inertia_dir = src.last_move step(src, src.inertia_dir) return 0 + //If not then we can reset inertia and move inertia_dir = 0 return 1 +/mob/proc/mob_has_gravity(turf/T) + return has_gravity(src, T) + +/mob/proc/mob_negates_gravity() + return 0 /mob/proc/Process_Spaceslipping(var/prob_slip = 5) //Setup slipage @@ -427,3 +430,6 @@ /mob/proc/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) return + +/mob/proc/update_gravity() + return diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 5dc3e03aef9..3aa64529fc7 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -491,7 +491,7 @@ obj/structure/cable/proc/avail() var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status == ORGAN_ROBOTIC) - src.item_heal_robotic(H, user, 0, 30) + item_heal_robotic(H, user, 0, 30) src.use(1) return else diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 5edc83056b7..71fed16e43c 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -25,6 +25,8 @@ return if(eject_casing) AC.loc = get_turf(src) //Eject casing onto ground. + AC.SpinAnimation(10, 1) //next gen special effects + if(empty_chamber) chambered = null chamber_round() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index eb8a702762a..52563385eee 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -29,6 +29,7 @@ CB = magazine.get_round(0) chambered = null CB.loc = get_turf(src.loc) + CB.SpinAnimation(10, 1) CB.update_icon() num_unloaded++ if (num_unloaded) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 60f94f2fe63..dd8fe000a56 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -39,6 +39,7 @@ pumped = 0 if(chambered)//We have a shell in the chamber chambered.loc = get_turf(src)//Eject casing + chambered.SpinAnimation(5, 1) chambered = null if(!magazine.ammo_count()) return 0 var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing. @@ -104,4 +105,4 @@ if (num_unloaded) user << "You break open \the [src] and unload [num_unloaded] shell\s." else - user << "[src] is empty." \ No newline at end of file + user << "[src] is empty." diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index fa20ddfd3ef..8e5959295c4 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -5,71 +5,66 @@ name = "pill" desc = "A tablet or capsule." icon = 'icons/obj/chemical.dmi' - icon_state = null + icon_state = "pill" item_state = "pill" possible_transfer_amounts = null volume = 50 - New() - ..() - if(!icon_state) - icon_state = "pill[rand(1,20)]" +/obj/item/weapon/reagent_containers/pill/New() + ..() + if(!icon_state) + icon_state = "pill[rand(1,20)]" - attack_self(mob/user) - return - attack(mob/M, mob/user, def_zone) - if(!canconsume(M, user)) - return 0 +/obj/item/weapon/reagent_containers/pill/attack_self(mob/user) + return - if(M == user) - M << "You swallow [src]." - M.unEquip(src) //icon update - if(reagents.total_volume) - reagents.reaction(M, INGEST) - spawn(5) - reagents.trans_to(M, reagents.total_volume) - qdel(src) - else - qdel(src) - return 1 - - else if(istype(M, /mob/living/carbon/human) ) - M.visible_message("[user] attempts to force [M] to swallow [src].", \ - "[user] attempts to force [M] to swallow [src].") - - if(!do_mob(user, M)) return - - user.unEquip(src) //icon update - M.visible_message("[user] forces [M] to swallow [src].", \ - "[user] forces [M] to swallow [src].") - - add_logs(user, M, "fed", object="[reagentlist(src)]") - - if(reagents.total_volume) - reagents.reaction(M, INGEST) - spawn(5) - reagents.trans_to(M, reagents.total_volume) - qdel(src) - else - qdel(src) - - return 1 +/obj/item/weapon/reagent_containers/pill/attack(mob/M, mob/user, def_zone) + if(!canconsume(M, user)) return 0 - afterattack(obj/target, mob/user , proximity) - if(!proximity) return - if(target.is_open_container() != 0 && target.reagents) - if(!target.reagents.total_volume) - user << "[target] is empty. There's nothing to dissolve [src] in." - return - user << "You dissolve [src] in [target]." - for(var/mob/O in viewers(2, user)) //viewers is necessary here because of the small radius - O << "[user] slips something into [target]." - reagents.trans_to(target, reagents.total_volume) - spawn(5) - qdel(src) + if(M == user) + M << "You swallow [src]." + + else + M.visible_message("[user] attempts to force [M] to swallow [src].", \ + "[user] attempts to force [M] to swallow [src].") + + if(!do_mob(user, M)) return + + M.visible_message("[user] forces [M] to swallow [src].", \ + "[user] forces [M] to swallow [src].") + + + user.unEquip(src) //icon update + add_logs(user, M, "fed", object="[reagentlist(src)]") + loc = M //Put the pill inside the mob. This fixes the issue where the pill appears to drop to the ground after someone eats it. + + if(reagents.total_volume) + reagents.reaction(M, INGEST) + spawn(5) + reagents.trans_to(M, reagents.total_volume) + qdel(src) + return 1 + else + qdel(src) + return 1 + return 0 + + +/obj/item/weapon/reagent_containers/pill/afterattack(obj/target, mob/user , proximity) + if(!proximity) return + if(target.is_open_container() != 0 && target.reagents) + if(!target.reagents.total_volume) + user << "[target] is empty. There's nothing to dissolve [src] in." + return + user << "You dissolve [src] in [target]." + for(var/mob/O in viewers(2, user)) //viewers is necessary here because of the small radius + O << "[user] slips something into [target]." + reagents.trans_to(target, reagents.total_volume) + spawn(5) + qdel(src) //////////////////////////////////////////////////////////////////////////////// @@ -81,81 +76,100 @@ name = "anti-toxins pill" desc = "Neutralizes many common toxins." icon_state = "pill17" - New() - ..() - reagents.add_reagent("anti_toxin", 50) + +/obj/item/weapon/reagent_containers/pill/antitox/New() + ..() + reagents.add_reagent("anti_toxin", 50) + /obj/item/weapon/reagent_containers/pill/tox name = "toxins pill" desc = "Highly toxic." icon_state = "pill5" - New() - ..() - reagents.add_reagent("toxin", 50) + +/obj/item/weapon/reagent_containers/pill/tox/New() + ..() + reagents.add_reagent("toxin", 50) + /obj/item/weapon/reagent_containers/pill/cyanide name = "cyanide pill" desc = "Don't swallow this." icon_state = "pill5" - New() - ..() - reagents.add_reagent("cyanide", 50) + +/obj/item/weapon/reagent_containers/pill/cyanide/New() + ..() + reagents.add_reagent("cyanide", 50) + /obj/item/weapon/reagent_containers/pill/adminordrazine name = "adminordrazine pill" desc = "It's magic. We don't have to explain it." icon_state = "pill16" - New() - ..() - reagents.add_reagent("adminordrazine", 50) + +/obj/item/weapon/reagent_containers/pill/adminordrazine/New() + ..() + reagents.add_reagent("adminordrazine", 50) + /obj/item/weapon/reagent_containers/pill/stox name = "sleeping pill" desc = "Commonly used to treat insomnia." icon_state = "pill8" - New() - ..() - reagents.add_reagent("stoxin", 30) +/obj/item/weapon/reagent_containers/pill/stox/New() + ..() + reagents.add_reagent("stoxin", 30) + /obj/item/weapon/reagent_containers/pill/kelotane name = "kelotane pill" desc = "Used to treat burns." icon_state = "pill11" - New() - ..() - reagents.add_reagent("kelotane", 30) + +/obj/item/weapon/reagent_containers/pill/kelotane/New() + ..() + reagents.add_reagent("kelotane", 30) + /obj/item/weapon/reagent_containers/pill/dermaline name = "dermaline pill" desc = "Used to treat severe burns." icon_state = "pill12" - New() - ..() - reagents.add_reagent("dermaline", 30) + +/obj/item/weapon/reagent_containers/pill/dermaline/New() + ..() + reagents.add_reagent("dermaline", 30) + /obj/item/weapon/reagent_containers/pill/inaprovaline name = "inaprovaline pill" desc = "Used to stabilize patients." icon_state = "pill20" - New() - ..() - reagents.add_reagent("inaprovaline", 30) + +/obj/item/weapon/reagent_containers/pill/inaprovaline/New() + ..() + reagents.add_reagent("inaprovaline", 30) + /obj/item/weapon/reagent_containers/pill/dexalin name = "dexalin pill" desc = "Used to treat oxygen deprivation." icon_state = "pill16" - New() - ..() - reagents.add_reagent("dexalin", 30) + +/obj/item/weapon/reagent_containers/pill/dexalin/New() + ..() + reagents.add_reagent("dexalin", 30) + /obj/item/weapon/reagent_containers/pill/bicaridine name = "bicaridine pill" desc = "Used to treat physical injuries." icon_state = "pill18" - New() - ..() - reagents.add_reagent("bicaridine", 30) + +/obj/item/weapon/reagent_containers/pill/bicaridine/New() + ..() + reagents.add_reagent("bicaridine", 30) + /obj/item/weapon/reagent_containers/pill/stimulant name = "stimulant pill" @@ -166,4 +180,4 @@ ..() reagents.add_reagent("hyperzine", 10) reagents.add_reagent("ethylredoxrazine", 10) - reagents.add_reagent("coffee", 30) + reagents.add_reagent("coffee", 30) \ No newline at end of file diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index f55f2888677..6fbc2f55fbd 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -151,30 +151,6 @@ return update_organ_icon() -/obj/item/proc/item_heal_robotic(var/mob/living/carbon/human/H, var/mob/user, var/brute, var/burn) - var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) - - var/dam //changes repair text based on how much brute/burn was supplied - - if(brute > burn) - dam = 1 - else - dam = 0 - - if(affecting.status == ORGAN_ROBOTIC) - if(brute > 0 && affecting.brute_dam > 0 || burn > 0 && affecting.burn_dam > 0) - affecting.heal_damage(brute,burn,1) - H.update_damage_overlays(0) - H.updatehealth() - for(var/mob/O in viewers(user, null)) - O.show_message(text("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!"), 1) - return - else - user << "[H]'s [affecting.getDisplayName()] is already in good condition" - return - else - return - //Returns total damage...kinda pointless really /obj/item/organ/limb/proc/get_damage() return brute_dam + burn_dam diff --git a/html/AddToChangelog.exe b/html/AddToChangelog.exe index a4fe303f7f0..3625bd27cca 100644 Binary files a/html/AddToChangelog.exe and b/html/AddToChangelog.exe differ diff --git a/html/changelog.html b/html/changelog.html index b7f0a216130..245a2c28a3c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1,1783 +1,1828 @@ - - - -
-
-
-
-20 May 2014-Kelenius updated:-
-
-
-16 May 2014-Menshin updated:-
-
-
-14 May 2014-Ikarrus updated:-
Ikarrus updated:-
-
-
-
-07 May 2014-/Tg/station Code Management updated:-
-
-
-30 April 2014-Gun Hog updated:-
-
-
-30 April 2014-Giacom updated:-
-
-
-27 April 2014-Ikarrus updated:-
-
-
-22 April 2014-Ikarrus updated:-
-
-
-20 April 2014-Steelpoint updated:-
-
-
-
-20 April 2014-Gun Hog updated:-
-
-
-11 April 2014-Jordie0608 updated:-
-
-
-10 April 2014-Steelpoint updated:-
Validsalad updated:-
Ikarrus updated:-
-
-
-3 April 2014-Ikarrus updated:-
-
-
-2 April 2014-Ikarrus updated:-
Giacom updated:-
-
-
-1 April 2014-Malkevin updated:-
MrStonedOne updated:-
-
-
-1 Aphril 2014-Aranclanos updated:-
-
-
-
-31 March 2014-MrPerson updated:-
Ikarrus updated:-
-
-
-28 March 2014-Aranclanos updated:-
-
-
-25 March 2014-Ikarrus updated:-
-
-
-22 March 2014-MrPerson updated:-
Giacom updated:-
-
-
-18 March 2014-Ikarrus updated:-
-
-
-17 March 2014-Giacom updated:-
-
-
-15 March 2014-Steelpoint/Validsalad updated:-
-
-
-12 March 2014-Yota updated:-
-
-
-14 March 2014-Ikarrus and Nienhaus updated:-
-
-
-10 March 2014-Miauw updated:-
Giacom updated:-
-
-
-5 March 2014-Various Coders updated:-
-
-
-3 March 2014-Miauw updated:-
-
-
-3 March 2014-Incoming5643 updated:-
Miauw updated:-
Drovidi Corv updated:-
TZK13 updated:-
ChuckTheSheep updated:-
-
-
-26 February 2014-Incoming5643 updated:-
-
-
-25 February 2014-Incoming5643 updated:-
-
-
-24 February 2014-Miauw updated:-
Incoming5643 updated:-
Ergovisavi updated:-
HornyGranny updated:-
Giacom updated:-
Razharas updated:-
-
-
-19 February 2014-Perakp updated:-
Aranclanos updated:-
-
-17 February 2014-Ergovisavi updated:-
Fleure updated:-
Yota updated:-
-
-
-9 February 2014-Neerti updated:-
ADamDirtyApe updated:-
Incoming5643 updated:-
Giacom updated:-
adrix89 updated:-
Razharas updated:-
-
-
-
-9 February 2014-Demas updated:-
-
-
-8 February 2014-Razharas updated:-
-
-
-
-8 February 2014-MrPerson updated:-
-
-
-
-5 February 2014-Yota updated:-
-
-
-
-3 February 2014-Demas updated:-
-
-
-2 February 2014-Demas updated:-
-
-
- 1 February 2014-Ergovisavi updated:-
ChuckTheSheep updated:-
-
-
-
-30 January 2014-Demas updated:-
-
-
-28 January 2014-Demas updated:-
-
-
-
-26 January 2014-Balrog updated:-
-
-
-
-25 januari 2014-Miauw updated:-
-
-
-
-24 January 2014-Ergovisavi updated:-
-
-
- 21 January 2014-MrPerson updated:-
20 January 2014-Petethegoat updated:-
-
-
-
-19 January 2014-Rolan7 updated:-
KazeEspada updated:-
-
- 17 January 2014-ManeaterMildred updated:-
Demas updated:-
-
-
-
-15 January 2014-Dumpdavidson updated:-
-
-
-14 January 2014-SirBayer updated:-
ManeaterMildred updated:-
Fleure updated:-
Giacom updated:-
Incoming updated:-
-
-
-
-12 January 2014-VistaPOWA updated:-
-
-
-11 January 2014-Errorage updated:-
Giacom updated:-
Cheridan updated:-
JJRCop updated:-
-
-
-10 January 2014-Giacom updated:-
ChuckTheSheep updated:-
Rumia29, Nienhaus updated:-
-
-
-7 January 2014-Fleure updated:-
-
-
-
-
-4 January 2014-Razharas updated:-
-
-
-2 January 2014-Demas updated:-
-
-
-2 January 2014-Fleure updated:-
-
-
-1 January 2014-Errorage updated:-
-
-
-31 December 2013-Fleure updated:-
-
-
-27 December 2013-Giacom updated:-
Miauw updated:-
-
-
-
-21 December 2013-RobRichards, Validsalad updated:-
Giacom updated:-
Bobylein updated:-
Perakp updated:-
Jordie updated:-
Nienhaus updated:-
-
-
-
-18 December 2013-JJRcop updated:-
Giacom updated:-
Adrinus updated:-
Incoming updated:-
Jordie0608 updated:-
-
-
-
-14 December 2013-Incoming updated:-
-
-
-
-9 December 2013-Giacom updated:-
-
-
-8 December 2013-Rolan7 updated:-
-
-
-
-5 December 2013-Razharas updated:-
-
-
-
-2 December 2013-Giacom updated:-
-
-
-1 December 2013-cookingboy3 updated:-
-
-
-
-28 November 2013-Malkevin updated:-
-
-
-30 November 2013-Yota updated:-
-
-
-
-27 November 2013-RobRichards updated:-
-
-
-
-17 November 2013-Laharl Montgommery updated:-
-
-
-
-16 November 2013-Kyrahabattoir updated:-
-
-
-
-15 November 2013-Giacom updated:-
-
-
-11 November 2013-Fleure updated:-
9 November 2013-Giacom, SuperSayu, Iamgoofball, VistaPOWA updated:-
-
-
-9 November 2013-Yota updated:-
-
-
-
-
-6 November 2013-Cheridan updated:-
-
-
-
-2 November 2013-Drovidi Corv updated:-
-
-
-
-27 October 2013-Giacom updated:-
-
-
-
-26 October 2013-Giacom updated:-
-
-
-
-
-14 October 2013-Giacom updated:-
-
-
-
-6 October 2013-Giacom updated:-
-
-
-
-8 October 2013-Cael_Aislinn updated:-
-
-
-
-6 October 2013-Ergovisavi updated:-
-
-
-
-29 September 2013-RobRichards updated:-
-
-
-
-28 September 2013-Ergovisavi updated:-
-
-
-
-
-26 September 2013-Cheridan updated:-
-
-
-
-21 September 2013-Malkevin updated:-
-
-
-19 September 2013-Malkevin updated:-
-
-
-
-17 September 2013-SuperSayu updated:-
-
-
-
-13 September 2013-JJRcop updated:-
-
-
-
-3 September 2013-Cael_Aislinn updated:-
-
-
-
-2 September 2013-Cael_Aislinn updated:-
-
-
-
-1 September 2013-Cael_Aislinn updated:-
-
-
-
-12 September 2013-AndroidSFV updated:-
-
-
-
-31 August 2013-Cael_Aislinn updated:-
-
-
-
-30 August 2013-Cael_Aislinn updated:-
-
-
-
-21 August 2013-Dumpdavidson updated:-
-
-
-
-18 August 2013-Delicious updated:-
-
-
-
-
-
-
-13 August 2013-Giacom updated:-
-
-
-
-12 August 2013-Giacom updated:-
-
-
-
-10 August 2013-Malkevin updated:-
-
-
-
-6 August 2013-Giacom updated:-
-
-
-
-5 August 2013-Kaze Espada updated:-
-
-
-
-4 August 2013-Giacom updated:-
-
-
-
-31 July 2013-Ricotez updated:-
-
-
-
-
-21 July 2013-Malkevin updated:-
-
-
-
-21 July 2013-Cheridan updated:-
-
-
-16 July 2013-Malkevin updated:-
-
-
-
-15 July 2013-Giacom updated:-
-
-
-7 July 2013-Giacom updated:-
-
-
-27 June 2013-Ikarrus updated:-
-
-
-
-16 June 2013-Khub updated:-
-
-
-15 June 2013-Carnie updated:-
Petethegoat updated:-
-
-
-9 June 2013-Ikarrus updated:-
-
-
-
-6 June 2013-Giacom updated:-
-
-
-4 June 2013-Dumpdavidson updated:-
-
-
-2 June 2013-Ikarrus updated:-
-
-
-25 May 2013-Ikarrus updated:-
-
-
-14 May 2013-Ikarrus updated:-
-
-
-11 May 2013-Malkevin updated:-
-
-
-7 May 2013-Ikarrus updated:-
-
-
-5 May 2013-Rolan7 updated:-
-
-
-2 May 2013-Malkevin updated:-
-
-
-30 April 2013-Ikarrus updated:-
-
-
-24 April 2013-Carnie updated:-
-
-
-
-26 April 2013-Aranclanos updated:-
Ikarrus updated:-
-
-
-
-23 April 2013-Malkevin updated:-
-
-
-22 April 2013-Malkevin updated:-
-
-
-
-22 April 2013-Cheridan updated:-
-
-
-
-17 April 2013-Giacom updated:-
-
-
-
-10 April 2013-Cheridan updated:-
-
-
-9 April 2013-Ikarrus updated:-
-
-
-4 April 2013-Cheridan updated:-
-
-
-28 March 2013-Carnie updated:-
-
-
-14 March 2013-Major_sephiroth updated:-
-
-
-13 March 2013-Elo001 updated:-
-
-
-8 March 2013-Kor updated:-
-
-
-6 March 2013-Petethegoat updated:-
-
-
-GoonStation 13 Development Team
- 24 February 2013-Ikarrus updated:-
Faerdan updated:-
- Coders: Stuntwaffle, Showtime, Pantaloons, Nannek, Keelin, Exadv1, hobnob, Justicefries, 0staf, sniperchance, AngriestIBM, BrianOBlivion
-- Spriters: Supernorn, Haruhi, Stuntwaffle, Pantaloons, Rho, SynthOrange, I Said No - -
Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 License. - |
+
+
+
+
+
+12 June 2014+Cheridan updated:+
+
+
+
+
+11 June 2014+Malkevin updated:+
+
+
+11 June 2014+Ikarrus updated:+
+
+6 June 2014+Gun Hog updated:+
+
+
+20 May 2014+Kelenius updated:+
+
+
+16 May 2014+Menshin updated:+
+
+
+14 May 2014+Ikarrus updated:+
Ikarrus updated:+
+
+
+
+07 May 2014+/Tg/station Code Management updated:+
+
+
+30 April 2014+Gun Hog updated:+
+
+
+30 April 2014+Giacom updated:+
+
+
+27 April 2014+Ikarrus updated:+
+
+
+22 April 2014+Ikarrus updated:+
+
+
+20 April 2014+Steelpoint updated:+
+
+
+
+20 April 2014+Gun Hog updated:+
+
+
+11 April 2014+Jordie0608 updated:+
+
+
+10 April 2014+Steelpoint updated:+
Validsalad updated:+
Ikarrus updated:+
+
+
+3 April 2014+Ikarrus updated:+
+
+
+2 April 2014+Ikarrus updated:+
Giacom updated:+
+
+
+1 April 2014+Malkevin updated:+
MrStonedOne updated:+
+
+
+1 Aphril 2014+Aranclanos updated:+
+
+
+
+31 March 2014+MrPerson updated:+
Ikarrus updated:+
+
+
+28 March 2014+Aranclanos updated:+
+
+
+25 March 2014+Ikarrus updated:+
+
+
+22 March 2014+MrPerson updated:+
Giacom updated:+
+
+
+18 March 2014+Ikarrus updated:+
+
+
+17 March 2014+Giacom updated:+
+
+
+15 March 2014+Steelpoint/Validsalad updated:+
+
+
+12 March 2014+Yota updated:+
+
+
+14 March 2014+Ikarrus and Nienhaus updated:+
+
+
+10 March 2014+Miauw updated:+
Giacom updated:+
+
+
+5 March 2014+Various Coders updated:+
+
+
+3 March 2014+Miauw updated:+
+
+
+3 March 2014+Incoming5643 updated:+
Miauw updated:+
Drovidi Corv updated:+
TZK13 updated:+
ChuckTheSheep updated:+
+
+
+26 February 2014+Incoming5643 updated:+
+
+
+25 February 2014+Incoming5643 updated:+
+
+
+24 February 2014+Miauw updated:+
Incoming5643 updated:+
Ergovisavi updated:+
HornyGranny updated:+
Giacom updated:+
Razharas updated:+
+
+
+19 February 2014+Perakp updated:+
Aranclanos updated:+
+
+17 February 2014+Ergovisavi updated:+
Fleure updated:+
Yota updated:+
+
+
+9 February 2014+Neerti updated:+
ADamDirtyApe updated:+
Incoming5643 updated:+
Giacom updated:+
adrix89 updated:+
Razharas updated:+
+
+
+
+9 February 2014+Demas updated:+
+
+
+8 February 2014+Razharas updated:+
+
+
+
+8 February 2014+MrPerson updated:+
+
+
+
+5 February 2014+Yota updated:+
+
+
+
+3 February 2014+Demas updated:+
+
+
+2 February 2014+Demas updated:+
+
+
+ 1 February 2014+Ergovisavi updated:+
ChuckTheSheep updated:+
+
+
+
+30 January 2014+Demas updated:+
+
+
+28 January 2014+Demas updated:+
+
+
+
+26 January 2014+Balrog updated:+
+
+
+
+25 januari 2014+Miauw updated:+
+
+
+
+24 January 2014+Ergovisavi updated:+
+
+
+ 21 January 2014+MrPerson updated:+
20 January 2014+Petethegoat updated:+
+
+
+
+19 January 2014+Rolan7 updated:+
KazeEspada updated:+
+
+ 17 January 2014+ManeaterMildred updated:+
Demas updated:+
+
+
+
+15 January 2014+Dumpdavidson updated:+
+
+
+14 January 2014+SirBayer updated:+
ManeaterMildred updated:+
Fleure updated:+
Giacom updated:+
Incoming updated:+
+
+
+
+12 January 2014+VistaPOWA updated:+
+
+
+11 January 2014+Errorage updated:+
Giacom updated:+
Cheridan updated:+
JJRCop updated:+
+
+
+10 January 2014+Giacom updated:+
ChuckTheSheep updated:+
Rumia29, Nienhaus updated:+
+
+
+7 January 2014+Fleure updated:+
+
+
+
+
+4 January 2014+Razharas updated:+
+
+
+2 January 2014+Demas updated:+
+
+
+2 January 2014+Fleure updated:+
+
+
+1 January 2014+Errorage updated:+
+
+
+31 December 2013+Fleure updated:+
+
+
+27 December 2013+Giacom updated:+
Miauw updated:+
+
+
+
+21 December 2013+RobRichards, Validsalad updated:+
Giacom updated:+
Bobylein updated:+
Perakp updated:+
Jordie updated:+
Nienhaus updated:+
+
+
+
+18 December 2013+JJRcop updated:+
Giacom updated:+
Adrinus updated:+
Incoming updated:+
Jordie0608 updated:+
+
+
+
+14 December 2013+Incoming updated:+
+
+
+
+9 December 2013+Giacom updated:+
+
+
+8 December 2013+Rolan7 updated:+
+
+
+
+5 December 2013+Razharas updated:+
+
+
+
+2 December 2013+Giacom updated:+
+
+
+1 December 2013+cookingboy3 updated:+
+
+
+
+28 November 2013+Malkevin updated:+
+
+
+30 November 2013+Yota updated:+
+
+
+
+27 November 2013+RobRichards updated:+
+
+
+
+17 November 2013+Laharl Montgommery updated:+
+
+
+
+16 November 2013+Kyrahabattoir updated:+
+
+
+
+15 November 2013+Giacom updated:+
+
+
+11 November 2013+Fleure updated:+
9 November 2013+Giacom, SuperSayu, Iamgoofball, VistaPOWA updated:+
+
+
+9 November 2013+Yota updated:+
+
+
+
+
+6 November 2013+Cheridan updated:+
+
+
+
+2 November 2013+Drovidi Corv updated:+
+
+
+
+27 October 2013+Giacom updated:+
+
+
+
+26 October 2013+Giacom updated:+
+
+
+
+
+14 October 2013+Giacom updated:+
+
+
+
+6 October 2013+Giacom updated:+
+
+
+
+8 October 2013+Cael_Aislinn updated:+
+
+
+
+6 October 2013+Ergovisavi updated:+
+
+
+
+29 September 2013+RobRichards updated:+
+
+
+
+28 September 2013+Ergovisavi updated:+
+
+
+
+
+26 September 2013+Cheridan updated:+
+
+
+
+21 September 2013+Malkevin updated:+
+
+
+19 September 2013+Malkevin updated:+
+
+
+
+17 September 2013+SuperSayu updated:+
+
+
+
+13 September 2013+JJRcop updated:+
+
+
+
+3 September 2013+Cael_Aislinn updated:+
+
+
+
+2 September 2013+Cael_Aislinn updated:+
+
+
+
+1 September 2013+Cael_Aislinn updated:+
+
+
+
+12 September 2013+AndroidSFV updated:+
+
+
+
+31 August 2013+Cael_Aislinn updated:+
+
+
+
+30 August 2013+Cael_Aislinn updated:+
+
+
+
+21 August 2013+Dumpdavidson updated:+
+
+
+
+18 August 2013+Delicious updated:+
+
+
+
+
+
+
+13 August 2013+Giacom updated:+
+
+
+
+12 August 2013+Giacom updated:+
+
+
+
+10 August 2013+Malkevin updated:+
+
+
+
+6 August 2013+Giacom updated:+
+
+
+
+5 August 2013+Kaze Espada updated:+
+
+
+
+4 August 2013+Giacom updated:+
+
+
+
+31 July 2013+Ricotez updated:+
+
+
+
+
+21 July 2013+Malkevin updated:+
+
+
+
+21 July 2013+Cheridan updated:+
+
+
+16 July 2013+Malkevin updated:+
+
+
+
+15 July 2013+Giacom updated:+
+
+
+7 July 2013+Giacom updated:+
+
+
+27 June 2013+Ikarrus updated:+
+
+
+
+16 June 2013+Khub updated:+
+
+
+15 June 2013+Carnie updated:+
Petethegoat updated:+
+
+
+9 June 2013+Ikarrus updated:+
+
+
+
+6 June 2013+Giacom updated:+
+
+
+4 June 2013+Dumpdavidson updated:+
+
+
+2 June 2013+Ikarrus updated:+
+
+
+25 May 2013+Ikarrus updated:+
+
+
+14 May 2013+Ikarrus updated:+
+
+
+11 May 2013+Malkevin updated:+
+
+
+7 May 2013+Ikarrus updated:+
+
+
+5 May 2013+Rolan7 updated:+
+
+
+2 May 2013+Malkevin updated:+
+
+
+30 April 2013+Ikarrus updated:+
+
+
+24 April 2013+Carnie updated:+
+
+
+
+26 April 2013+Aranclanos updated:+
Ikarrus updated:+
+
+
+
+23 April 2013+Malkevin updated:+
+
+
+22 April 2013+Malkevin updated:+
+
+
+
+22 April 2013+Cheridan updated:+
+
+
+
+17 April 2013+Giacom updated:+
+
+
+
+10 April 2013+Cheridan updated:+
+
+
+9 April 2013+Ikarrus updated:+
+
+
+4 April 2013+Cheridan updated:+
+
+
+28 March 2013+Carnie updated:+
+
+
+14 March 2013+Major_sephiroth updated:+
+
+
+13 March 2013+Elo001 updated:+
+
+
+8 March 2013+Kor updated:+
+
+
+6 March 2013+Petethegoat updated:+
+
+
+GoonStation 13 Development Team
+ 24 February 2013+Ikarrus updated:+
Faerdan updated:+
+ Coders: Stuntwaffle, Showtime, Pantaloons, Nannek, Keelin, Exadv1, hobnob, Justicefries, 0staf, sniperchance, AngriestIBM, BrianOBlivion
++ Spriters: Supernorn, Haruhi, Stuntwaffle, Pantaloons, Rho, SynthOrange, I Said No + +
Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 License. + |