diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 624b83569e0..e2ee0dc56b3 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -54,6 +54,8 @@ var/global/datum/getrev/revdata = new("config/svndir.txt") if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries"))) var/list/filelist = dd_file2list("[svndirpath]/entries",null) + if(filelist.len < 4) + return abort() revision = filelist[4] commiter = filelist[12] diary << "Revision info loaded succesfully" diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index 03bf518d7b4..3f5eebc7ebc 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -1,6 +1,7 @@ /obj/effect/decal/ash - name = "Ashes" + name = "ashes" desc = "Ashes to ashes, dust to dust, and into space." + gender = PLURAL icon = 'objects.dmi' icon_state = "ash" anchored = 1 @@ -12,27 +13,31 @@ /obj/effect/decal/remains/human name = "remains" - desc = "These remains have a strange sense about them..." + desc = "They look like human remains. They have a strange aura about them." + gender = PLURAL icon = 'blood.dmi' icon_state = "remains" anchored = 1 /obj/effect/decal/remains/xeno name = "remains" - desc = "These remains have a strange sense about them..." + desc = "They look like the remains of something... alien. They have a strange aura about them." + gender = PLURAL icon = 'blood.dmi' icon_state = "remainsxeno" anchored = 1 /obj/effect/decal/remains/robot name = "remains" - desc = "These remains have a strange sense about them..." + desc = "They look like the remains of something mechanical. They have a strange aura about them." + gender = PLURAL icon = 'robots.dmi' icon_state = "remainsrobot" anchored = 1 /obj/effect/decal/point - name = "point" + name = "arrow" + desc = "It's an arrow hanging in mid-air. There may be a wizard about." icon = 'screen1.dmi' icon_state = "arrow" layer = 16.0 @@ -44,8 +49,9 @@ //HUMANS /obj/effect/decal/cleanable/blood - name = "Blood" + name = "blood" desc = "It's red and disgusting." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -65,6 +71,7 @@ /obj/effect/decal/cleanable/blood/drip name = "drips of blood" desc = "It's red." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -73,8 +80,9 @@ track_amt = 0 /obj/effect/decal/cleanable/mucus - name = "Mucus" + name = "mucus" desc = "Disgusting mucus." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -87,12 +95,15 @@ random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5") /obj/effect/decal/cleanable/blood/tracks - icon_state = "tracks" + icon_state = "blood" + desc = "They look like tracks left by wheels." + gender = PLURAL random_icon_states = null /obj/effect/decal/cleanable/blood/gibs name = "gibs" - desc = "Grisly...and not the good kind neither." + desc = "They look bloody and gruesome." + gender = PLURAL density = 0 anchored = 0 layer = 2 @@ -119,7 +130,8 @@ /obj/effect/decal/cleanable/xenoblood name = "xeno blood" - desc = "It's green blood. What the hell?" + desc = "It's green and acidic. It looks like... blood?" + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -139,6 +151,7 @@ /obj/effect/decal/cleanable/xenoblood/xgibs name = "xeno gibs" desc = "Gnarly..." + gender = PLURAL icon = 'blood.dmi' icon_state = "xgib1" random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6") @@ -166,7 +179,8 @@ /obj/effect/decal/cleanable/robot_debris name = "robot debris" - desc = "Useless heap of junk...or is it..." + desc = "It's a useless heap of junk... or is it?" + gender = PLURAL density = 0 anchored = 0 layer = 2 @@ -185,7 +199,8 @@ /obj/effect/decal/cleanable/oil name = "motor oil" - desc = "It's black oil." + desc = "It's black and greasy. Looks like Beepsky made another mess." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -207,6 +222,7 @@ /obj/effect/decal/cleanable/generic name = "clutter" desc = "Someone should clean that up." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -216,6 +232,7 @@ /obj/effect/decal/cleanable/dirt name = "dirt" desc = "Someone should clean that up." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -223,8 +240,9 @@ icon_state = "dirt" /obj/effect/decal/cleanable/greenglow - name = "green glow" + name = "glowing goo" desc = "Eerie. This makes you feel creepy." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -233,7 +251,7 @@ /obj/effect/decal/cleanable/cobweb name = "cobweb" - desc = "Someone should remove that." + desc = "Somebody should remove that." density = 0 anchored = 1 layer = 3 @@ -242,7 +260,7 @@ /obj/effect/decal/cleanable/molten_item name = "gooey grey mass" - desc = "Huh. Creepy..." + desc = "It looks like a melted... something." density = 0 anchored = 1 layer = 3 @@ -251,7 +269,7 @@ /obj/effect/decal/cleanable/cobweb2 name = "cobweb" - desc = "Someone should remove that." + desc = "Somebody should remove that." density = 0 anchored = 1 layer = 3 @@ -266,8 +284,9 @@ //Vomit (sorry) /obj/effect/decal/cleanable/vomit - name = "Vomit" - desc = "Unpleasant." + name = "vomit" + desc = "Gosh, how unpleasant." + gender = PLURAL density = 0 anchored = 1 layer = 2 @@ -282,8 +301,8 @@ ..() /obj/effect/decal/cleanable/tomato_smudge - name = "Tomato smooth" - desc = "It looks sort of like blood, but it's not that dark." + name = "tomato smudge" + desc = "It's red." density = 0 anchored = 1 layer = 2 @@ -291,7 +310,7 @@ random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3") /obj/effect/decal/cleanable/egg_smudge - name = "Smashed egg" + name = "smashed egg" desc = "Seems like this one won't hatch." density = 0 anchored = 1 @@ -300,8 +319,8 @@ random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3") /obj/effect/decal/cleanable/pie_smudge //honk - name = "Smashed pie" - desc = "Pie cream from a cream pie." + name = "smashed pie" + desc = "It's pie cream from a cream pie." density = 0 anchored = 1 layer = 2 diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 88af344c6a4..0d617c0f471 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -19,8 +19,8 @@ gl_uid = 1 /obj/machinery/autolathe - name = "Autolathe" - desc = "Produces items with metal and glass." + name = "\improper Autolathe" + desc = "It produces items using metal and glass." icon_state = "autolathe" density = 1 var/m_amount = 0.0 @@ -42,7 +42,7 @@ active_power_usage = 100 /obj/machinery/camera - name = "Security Camera" + name = "security camera" desc = "This is used to monitor rooms." icon = 'monitors.dmi' icon_state = "camera" @@ -60,8 +60,8 @@ active_power_usage = 10 /obj/machinery/dispenser - desc = "A simple yet bulky one-way storage device for gas tanks. Holds plasma and oxygen tanks." - name = "Tank Storage Unit" + name = "tank storage unit" + desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks." icon = 'objects.dmi' icon_state = "dispenser" density = 1 @@ -73,8 +73,8 @@ active_power_usage = 10 /obj/machinery/dna_scanner - name = "DNA Scanner/Implanter" - desc = "Scans DNA." + name = "\improper DNA scanner/implanter" + desc = "It scans DNA structures." icon = 'Cryogenic2.dmi' icon_state = "scanner_0" density = 1 @@ -86,8 +86,8 @@ active_power_usage = 300 /obj/machinery/dna_scannernew - name = "DNA Modifier" - desc = "Scans DNA better." + name = "\improper DNA modifier" + desc = "It scans DNA structures." icon = 'Cryogenic2.dmi' icon_state = "scanner_0" density = 1 @@ -99,7 +99,7 @@ active_power_usage = 300 /obj/machinery/firealarm - name = "Fire Alarm" + name = "fire alarm" desc = "Pull this in case of emergency." icon = 'monitors.dmi' icon_state = "fire0" @@ -114,8 +114,15 @@ active_power_usage = 6 power_channel = ENVIRON + New() + if(z == 1) + if(security_level) + src.overlays += image('monitors.dmi', "overlay_[get_security_level()]") + else + src.overlays += image('monitors.dmi', "overlay_green") + /obj/machinery/partyalarm - name = "Party Button" + name = "\improper Party Button" desc = "Cuban Pete is in the house!" icon = 'monitors.dmi' icon_state = "fire0" @@ -132,7 +139,7 @@ /obj/machinery/igniter name = "igniter" - desc = "Might as well make that detonator, right?" + desc = "It's useful for igniting plasma." icon = 'stationobjs.dmi' icon_state = "igniter1" var/id = null @@ -144,7 +151,7 @@ /obj/machinery/injector name = "injector" - desc = "Injects gas into a chamber." + desc = "It injects gas into a chamber." icon = 'stationobjs.dmi' icon_state = "injector" density = 1 @@ -183,8 +190,8 @@ active_power_usage = 4 /obj/machinery/restruct - name = "DNA Physical Restructurization Accelerator" - desc = "This looks complex." + name = "\improper DNA physical restructurization accelerator" + desc = "It looks ridiculously complex." icon = 'Cryogenic2.dmi' icon_state = "restruct_0" density = 1 @@ -196,8 +203,8 @@ active_power_usage = 600 /obj/machinery/scan_console - name = "DNA Scanner Access Console" - desc = "Scans DNA." + name = "\improper DNA Scanner Access Console" + desc = "It scans DNA structures." icon = 'computer.dmi' icon_state = "scanner" density = 1 @@ -275,13 +282,22 @@ 16= door safties */ + + var/exposedwires = 0 + var/wires = 3 + /* + Bitflag, 1=checkID + 2=Network Access + */ + anchored = 1.0 use_power = 1 idle_power_usage = 2 active_power_usage = 4 /obj/machinery/driver_button - name = "Mass Driver Button" + name = "mass driver button" + desc = "FIRE AWAY!" icon = 'objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a Mass Driver." @@ -293,7 +309,8 @@ active_power_usage = 4 /obj/machinery/ignition_switch - name = "Ignition Switch" + name = "ignition switch" + desc = "It activates an igniter." icon = 'objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a mounted igniter." @@ -312,8 +329,8 @@ var/lockeddown = 0 /obj/machinery/teleport/hub - name = "hub" - desc = "A hub of a teleporting machine." + name = "teleporter hub" + desc = "It's the hub of a teleporting machine." icon_state = "tele0" var/accurate = 0 use_power = 1 @@ -352,7 +369,7 @@ /obj/machinery/power/terminal name = "terminal" icon_state = "term" - desc = "An underfloor wiring terminal for power equipment" + desc = "It's an underfloor wiring terminal for power equipment." level = 1 layer = TURF_LAYER var/obj/machinery/power/master = null @@ -361,8 +378,8 @@ layer = 2.6 // a bit above wires /obj/machinery/power/generator - name = "generator" - desc = "A high efficiency thermoelectric generator." + name = "thermoelectric generator" + desc = "It's a high efficiency thermoelectric generator." icon_state = "teg" anchored = 1 density = 1 @@ -374,8 +391,8 @@ var/lastgenlev = -1 /obj/machinery/power/generator_type2 - name = "generator" - desc = "A high efficiency thermoelectric generator." + name = "thermoelectric generator" + desc = "It's a high efficiency thermoelectric generator." icon_state = "teg" anchored = 1 density = 1 @@ -386,19 +403,18 @@ var/lastgen = 0 var/lastgenlev = -1 - /obj/machinery/power/monitor - name = "Power Monitoring Computer" - desc = "Used to monitor the power, and remotely toggle main breakers." - icon = 'computer.dmi' - icon_state = "power" - density = 1 - anchored = 1 - use_power = 2 - idle_power_usage = 20 - active_power_usage = 80 - var/control = 0 - req_access = list(access_engine_equip) + name = "power monitoring computer" + desc = "It monitors power levels across the station, and can remotely toggle main breakers." + icon = 'computer.dmi' + icon_state = "power" + density = 1 + anchored = 1 + use_power = 2 + idle_power_usage = 20 + active_power_usage = 80 + var/control = 0 + req_access = list(access_engine_equip) /obj/machinery/cell_charger name = "cell charger" @@ -413,8 +429,8 @@ active_power_usage = 60 /obj/machinery/light_switch - desc = "A light switch" - name = null + name = "light switch" + desc = "It turns lights on and off. What are you, simple?" icon = 'power.dmi' icon_state = "light1" anchored = 1.0 @@ -449,16 +465,17 @@ icon_state = "holopad0" var mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time. + last_request = 0 //to prevent request spam. ~Carn /obj/machinery/hologram/projector - name = "Hologram Projector" - desc = "Makes a hologram appear...somehow..." + name = "hologram projector" + desc = "It makes a hologram appear...with magnets or something..." icon = 'stationobjs.dmi' icon_state = "hologram0" /obj/machinery/hologram/proj_ai - name = "Hologram Projector Platform" - desc = "Used for the fun of the diabolical AI." + name = "hologram projector platform" + desc = "It's used by the AI for fooling around." icon = 'stationobjs.dmi' icon_state = "hologram0" var diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 4f043aaa959..dd97fea6c59 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -19,7 +19,7 @@ return null return 0 -/proc/get_area_name(N) //get area by it's name +/proc/get_area_name(N) //get area by its name for(var/area/A in world) if(A.name == N) return A diff --git a/code/defines/turf.dm b/code/defines/turf.dm index 133e82e63a5..ccaeb00b604 100644 --- a/code/defines/turf.dm +++ b/code/defines/turf.dm @@ -37,7 +37,7 @@ /turf/space icon = 'space.dmi' - name = "space" + name = "\proper space" icon_state = "placeholder" temperature = TCMB diff --git a/code/game/events/EventProcs/ninja_equipment.dm b/code/game/events/EventProcs/ninja_equipment.dm index 288e3073dc5..d0bc9efdaac 100644 --- a/code/game/events/EventProcs/ninja_equipment.dm +++ b/code/game/events/EventProcs/ninja_equipment.dm @@ -1121,7 +1121,7 @@ ________________________________________________________________________________ else break U << "\blue Gained [totaldrain] energy from [src]." else - U << "\red The exosuit's battery has run dry of power. You must find another source." + U << "\red The exosuit's battery has run dry. You must find another source of power." if("CYBORG") var/mob/living/silicon/robot/A = target diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 8c49bd3e3a7..48de9254036 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -207,14 +207,14 @@ src.text += "

The evil Space Wizards Federation have recently broke their most feared wizard, known only as \"[SWF_desc]\" out of space jail. " src.text += "He is on the run, last spotted in a system near your present location. If anybody suspicious is located aboard, please " - src.text += "approach with EXTREME caution. Cent. Com also recommends that it would be wise to not inform the crew of this, due to it's fearful nature." + src.text += "approach with EXTREME caution. Cent. Com also recommends that it would be wise to not inform the crew of this, due to their fearful nature." src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells." /datum/intercept_text/proc/build_nuke(datum/mind/correct_person) src.text += "

Cent. Com recently recieved a report of a plot to destory one of our stations in your area. We believe the Nuclear Authentication Disc " - src.text += "that is standard issue aboard your vessel may be a target, and reccommend removal of this object, and it's storage in a safe " + src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe " src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but " - src.text += "the most trusted members." + src.text += "the most trusted crew-members." /datum/intercept_text/proc/build_malf(datum/mind/correct_person) var/a_name = pick(src.anomalies) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 17c970363de..57dea7fc0aa 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -137,8 +137,8 @@ T.loc = C //put shade in stone T.nodamage = 1 T.canmove = 0 - T.health = T.max_health + T.health = T.maxHealth C.icon_state = "soulstone2" - T << "Your soul has been recaptured by the soul stone, it's arcane energies reknitting your ethereal form" + T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form" U << "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone." return \ No newline at end of file diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index a0d3cfbc414..704169b151f 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -88,7 +88,7 @@ "\blue [user] has cleaned the microwave.", \ "\blue You have cleaned the microwave." \ ) - src.dirty = 0 // It's cleaned! + src.dirty = 0 // It's clean! src.broken = 0 // just to be sure src.icon_state = "mw" src.flags = OPENCONTAINER diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 371a9894d61..5c1a0f70cc1 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -478,7 +478,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) src.panelopen = !src.panelopen playsound(src.loc, 'Screwdriver.ogg', 100, 1) - user << text("You [] the Unit's maintenance panel.",(src.panelopen ? "open up" : "close") ) + user << text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") ) src.updateUsrDialog() return if ( istype(I, /obj/item/weapon/grab) ) @@ -492,7 +492,7 @@ usr << "The unit is not operational." return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty - user << "The Unit's storage area is too cluttered." + user << "The unit's storage area is too cluttered." return for (var/mob/V in viewers(user)) V.show_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.", 3) diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index 91cda23916f..60d74c19674 100644 --- a/code/game/magic/cultist/ritual.dm +++ b/code/game/magic/cultist/ritual.dm @@ -343,12 +343,13 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", Create a wall: Destroy Travel Self
Summon cultist: Join Other Self
Free a cultist: Travel technology other
- Deafen: Hide other see
+ Deafen: Hide Other See
Blind: Destroy See Other
Blood Boil: Destroy See Blood
- Communicate: Self other technology
- Stun: Join hide technology
- Summon Cultist Armor: Hell destroy other
+ Communicate: Self Other Technology
+ Stun: Join Hide Technology
+ Summon Cultist Armor: Hell Destroy Other
+ See Invisible: See Hell Join

Rune Descriptions

Teleport self

@@ -396,7 +397,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",

Stun

Unlike other runes, this ons is supposed to be used in talisman form. When invoked directly, it simply releases some dark energy, briefly stunning everyone around. When imbued into a talisman, you can force all of its energy into one person, stunning him so hard he cant even speak. However, effect wears off rather fast.

Equip Armor

- When this rune is invoked, either from a rune or a talisman, it will equip the user with the armor of the followers of Nar-Sie. To use this rune to it's fullest extent, make sure you are not wearing any form of headgear, armor, gloves or shoes, and make sure you are not holding anything in your hands.
+ When this rune is invoked, either from a rune or a talisman, it will equip the user with the armor of the followers of Nar-Sie. To use this rune to its fullest extent, make sure you are not wearing any form of headgear, armor, gloves or shoes, and make sure you are not holding anything in your hands.
+

See Invisible

+ When invoked when standing on it, this rune allows the user to see the the world beyond as long as he does not move.
"} diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index bdcc7480aba..6691b3b571d 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -93,7 +93,7 @@ var/list/sacrificed = list() usr.say("N'ath reth sh'yro eth d'raggathnor!") else usr.whisper("N'ath reth sh'yro eth d'raggathnor!") - usr.visible_message("\red Rune disappears with a flash of red light, and in it's place now a book lies.", \ + usr.visible_message("\red Rune disappears with a flash of red light, and in its place now a book lies.", \ "\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \ "\red You hear a pop and smell ozone.") if(istype(src,/obj/effect/rune)) @@ -354,7 +354,7 @@ var/list/sacrificed = list() var/mob/living/carbon/human/L = usr usr.say("Fwe'sh mah erl nyag r'ya!") usr.visible_message("\red [usr]'s eyes glow blue as \he freezes in place, absolutely motionless.", \ - "\red The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this it's a great sight, being here strains your mind and body. Hurry.", \ + "\red The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry...", \ "\red You hear only complete silence for a moment.") usr.ghostize() for(L.ajourn=1,L.ajourn) @@ -779,7 +779,7 @@ var/list/sacrificed = list() if(iscultist(C)) C.say("N'ath reth sh'yro eth d'rekkathnor!") C.take_overall_damage(25, 0) - user.visible_message("\red Rune disappears with a flash of red light, and in it's place now a body lies.", \ + user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \ "\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \ "\red You hear a pop and smell ozone.") del(src) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index e9a65d77750..f8df8a8c63e 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -496,7 +496,7 @@ /obj/item/weapon/reagent_containers/food/snacks/burger/mime name = "Mime Burger" - desc = "It's taste defies language." + desc = "Its taste defies language." icon_state = "mimeburger" /obj/item/weapon/reagent_containers/food/snacks/omelette diff --git a/code/modules/mob/simple_animal/cat.dm b/code/modules/mob/simple_animal/cat.dm index f511699f4cb..c8edcb14d7b 100644 --- a/code/modules/mob/simple_animal/cat.dm +++ b/code/modules/mob/simple_animal/cat.dm @@ -9,7 +9,7 @@ speak = list("Meow!","Esp!","Purr!","HSSSSS") speak_emote = list("purrs", "meows") emote_hear = list("meows","mews") - emote_see = list("shakes it's head", "shivers") + emote_see = list("shakes its head", "shivers") speak_chance = 1 turns_per_move = 5 meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat diff --git a/code/modules/mob/simple_animal/corgi.dm b/code/modules/mob/simple_animal/corgi.dm index b0741d3f6a3..2cf1138d779 100644 --- a/code/modules/mob/simple_animal/corgi.dm +++ b/code/modules/mob/simple_animal/corgi.dm @@ -1,8 +1,8 @@ //Corgi /mob/living/simple_animal/corgi - name = "corgi" + name = "\improper corgi" real_name = "corgi" - desc = "Puppy!!" + desc = "It's a corgi." icon = 'mob.dmi' icon_state = "corgi" icon_living = "corgi" @@ -10,9 +10,9 @@ speak = list("YAP", "Woof!", "Bark!", "AUUUUUU") speak_emote = list("barks", "woofs") emote_hear = list("barks", "woofs", "yaps","pants") - emote_see = list("shakes it's head", "shivers") + emote_see = list("shakes its head", "shivers") speak_chance = 1 - turns_per_move = 5 + turns_per_move = 10 meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi meat_amount = 3 response_help = "pets the" @@ -51,8 +51,9 @@ /mob/living/simple_animal/corgi/show_inv(mob/user as mob) /* user.machine = src + if(user.stat) return - var/dat = "
Inventory of [src]

" + var/dat = "

Inventory of [name]

" if(inventory_head) dat += "
Head: [inventory_head] (Remove)" else @@ -63,7 +64,7 @@ dat += "
Back: Nothing" user << browse(dat, text("window=mob[];size=325x500", name)) - onclose(user, "mob[name]") + onclose(user, "mob[real_name]") */ return @@ -72,22 +73,24 @@ //helmet and armor = 100% protection if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) if( O.force ) - usr << "\red This animal is wearing too much armor. You can't cause it any damage." + usr << "\red This animal is wearing too much armor. You can't cause /him any damage." for (var/mob/M in viewers(src, null)) M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.") else - usr << "\red This animal is wearing too much armor. You can't reach it's skin." + usr << "\red This animal is wearing too much armor. You can't reach its skin." for (var/mob/M in viewers(src, null)) M.show_message("\red [user] gently taps [src] with the [O]. ") if(prob(15)) - emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on it's face") + emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face") return ..() /mob/living/simple_animal/corgi/Topic(href, href_list) + if(usr.stat) return + //Removing from inventory if(href_list["remove_inv"]) - if(get_dist(src,usr) > 1) + if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) || isalienadult(usr))) return var/remove_from = href_list["remove_inv"] switch(remove_from) @@ -98,36 +101,36 @@ speak = list("YAP", "Woof!", "Bark!", "AUUUUUU") speak_emote = list("barks", "woofs") emote_hear = list("barks", "woofs", "yaps","pants") - emote_see = list("shakes it's head", "shivers") + emote_see = list("shakes its head", "shivers") desc = "It's a corgi." src.sd_SetLuminosity(0) inventory_head.loc = src.loc inventory_head = null else - usr << "\red There is nothing on its [remove_from]." + usr << "\red There is nothing to remove from its [remove_from]." return if("back") if(inventory_back) inventory_back.loc = src.loc inventory_back = null else - usr << "\red There is nothing on its [remove_from]." + usr << "\red There is nothing to remove from its [remove_from]." return - show_inv(usr) + //show_inv(usr) //Commented out because changing Ian's name and then calling up his inventory opens a new inventory...which is annoying. //Adding things to inventory else if(href_list["add_inv"]) - if(get_dist(src,usr) > 1) - return - if(!usr.get_active_hand()) - usr << "\red You have nothing in your active hand to put in the slot." + if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) || isalienadult(usr))) return var/add_to = href_list["add_inv"] + if(!usr.get_active_hand()) + usr << "\red You have nothing in your hand to put on its [add_to]." + return switch(add_to) if("head") if(inventory_head) - usr << "\red The [inventory_head] is already in this slot." + usr << "\red It's is already wearing something." return else var/obj/item/item_to_add = usr.get_active_hand() @@ -171,7 +174,7 @@ ) if( ! ( item_to_add.type in allowed_types ) ) - usr << "\red The corgi doesn't seem too keen on wearing that item." + usr << "\red It doesn't seem too keen on wearing that item." return usr.drop_item() @@ -194,13 +197,13 @@ desc = "It's a cute little kitty-cat! ... wait ... what the hell?" if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears) name = "Hoppy" - emote_see = list("twitches his nose", "hops around a bit") + emote_see = list("twitches its nose", "hops around a bit") desc = "This is hoppy. It's a corgi-...urmm... bunny rabbit" if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret) name = "Yann" - desc = "mon dieu! C'est un chien!" + desc = "Mon dieu! C'est un chien!" speak = list("le woof!", "le bark!", "JAPPE!!") - emote_see = list("cowers in fear", "surrenders", "plays dead") + emote_see = list("cowers in fear", "surrenders", "plays dead","looks as though there is a wall in front of /him") if(/obj/item/clothing/head/det_hat) name = "Detective [real_name]" desc = "[name] sees through your lies..." @@ -209,13 +212,13 @@ name = "Nurse [real_name]" desc = "[name] needs 100cc of beef jerky...STAT!" if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate) - name = "'[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibbles","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]'" + name = "'[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]'" desc = "Yaarghh!! Thar' be a scurvy dog!" emote_see = list("hunts for treasure","stares coldly...","gnashes his tiny corgi teeth") emote_hear = list("growls ferociously", "snarls") speak = list("Arrrrgh!!","Grrrrrr!") if(/obj/item/clothing/head/ushanka) - name = "[pick("Comrade","Commissar")] [real_name]" + name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]" desc = "A follower of Karl Barx." emote_see = list("contemplates the failings of the capitalist economic model", "ponders the pros and cons of vangaurdism") if(/obj/item/clothing/head/collectable/police) @@ -226,7 +229,7 @@ name = "Grandwizard [real_name]" speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!") if(/obj/item/weapon/bedsheet) - name = "The ghost" + name = "\improper Ghost" speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU") emote_see = list("stumbles around", "shivers") emote_hear = list("howls","groans") @@ -239,7 +242,7 @@ if("back") if(inventory_back) - usr << "\red The [inventory_back] is already in this slot." + usr << "\red It's already wearing something." return else var/obj/item/item_to_add = usr.get_active_hand() @@ -255,7 +258,7 @@ ) if( ! ( item_to_add.type in allowed_types ) ) - usr << "\red The object cannot fit on this animal." + usr << "\red This object won't fit." return usr.drop_item() @@ -271,6 +274,7 @@ /mob/living/simple_animal/corgi/Ian name = "Ian" real_name = "Ian" //Intended to hold the name without altering it. + gender = "male" desc = "It's a corgi." var/turns_since_scan = 0 var/obj/movement_target @@ -323,7 +327,7 @@ emote("stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face") if(prob(1)) - emote("dances around") + emote(pick("dances around","chases its tail")) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) dir = i @@ -343,11 +347,12 @@ var/mob/tmob = AM if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) if(prob(70)) - for(var/mob/M in viewers(src, null)) - if(M.client) - M << "\red [src] fails to push [tmob]'s fat ass out of the way." + src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return + if(tmob.nopush) + now_pushing = 0 + return tmob.LAssailant = src now_pushing = 0 @@ -375,6 +380,20 @@ mind.assigned_role = "Corgi" mind.key = G.key + +/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri + if(istype(O, /obj/item/weapon/newspaper)) + if(alive) + for(var/mob/M in viewers(user, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\blue [user] baps [name] on the nose with the rolled up [O]") + spawn(0) + for(var/i in list(1,2,4,8,4,2,1,2)) + dir = i + sleep(1) + else + ..() + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi name = "Corgi meat" desc = "Tastes like... well you know..." \ No newline at end of file diff --git a/code/modules/mob/simple_animal/life.dm b/code/modules/mob/simple_animal/life.dm index 1cbdc856432..7c780a9d0f1 100644 --- a/code/modules/mob/simple_animal/life.dm +++ b/code/modules/mob/simple_animal/life.dm @@ -2,7 +2,7 @@ name = "animal" var/icon_living = "" var/icon_dead = "" - var/max_health = 20 + maxHealth = 20 var/alive = 1 var/list/speak = list() var/list/speak_emote = list()// Emotes while speaking IE: Ian [emote], [text] -- Ian barks, "WOOF!". Spoken text is generated from the speak variable. @@ -50,6 +50,8 @@ var/wall_smash = 0 //if they can smash walls var/speed = 0 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster + + var/obj/item/device/radio/headset/ears = null /mob/living/simple_animal/New() ..() verbs -= /mob/verb/observe @@ -70,24 +72,59 @@ density = 1 return + if(health < 1) - alive = 0 - icon_state = icon_dead - stat = 2 //Dead - density = 0 - return + Die() - if(health > max_health) - health = max_health + if(health > maxHealth) + health = maxHealth +/* + // Stun/Weaken + + if (paralysis || stunned || weakened) //Stunned etc. + if (stunned > 0) + AdjustStunned(-1) + stat = 0 + if (weakened > 0) + AdjustWeakened(-1) + lying = 1 + stat = 0 + if (paralysis > 0) + AdjustParalysis(-1) + blinded = 1 + lying = 1 + stat = 1 + var/h = hand + hand = 0 + drop_item() + hand = 1 + drop_item() + hand = h + + else //Not stunned. + lying = 0 + stat = 0 + + if(paralysis || stunned || weakened || buckled) + canmove = 0 + else + canmove = 1 +*/ //Movement if(!ckey && !stop_automated_movement) - if(isturf(src.loc) && !resting && !buckled) //This is so it only moves if it's not inside a closet, gentics machine, etc. + if(isturf(src.loc) && !resting && !buckled && canmove) //This is so it only moves if it's not inside a closet, gentics machine, etc. turns_since_move++ if(turns_since_move >= turns_per_move) Move(get_step(src,pick(cardinal))) turns_since_move = 0 + + + + + + //Speaking if(speak_chance) if(prob(speak_chance)) @@ -201,6 +238,7 @@ /mob/living/simple_animal/emote(var/act) if(act) + if(act == "scream") act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P for (var/mob/O in viewers(src, null)) O.show_message("[src] [act].") @@ -267,9 +305,9 @@ if(istype(O, /obj/item/stack/medical)) if(alive) var/obj/item/stack/medical/MED = O - if(health < max_health) + if(health < maxHealth) if(MED.amount >= 1) - health = min(max_health, health + MED.heal_brute) + health = min(maxHealth, health + MED.heal_brute) MED.amount -= 1 if(MED.amount <= 0) del(MED) @@ -289,9 +327,24 @@ for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") + + /mob/living/simple_animal/movement_delay() var/tally = 0 //Incase I need to add stuff other than "speed" later tally = speed - return tally \ No newline at end of file + return tally + +/mob/living/simple_animal/Stat() + ..() + + statpanel("Status") + stat(null, "Health: [round((health / maxHealth) * 100)]%") + +/mob/living/simple_animal/proc/Die() + alive = 0 + icon_state = icon_dead + stat = DEAD + density = 0 + return diff --git a/code/modules/mob/simple_animal/shade.dm b/code/modules/mob/simple_animal/shade.dm index 6bf0477312d..480d7bc8c0a 100644 --- a/code/modules/mob/simple_animal/shade.dm +++ b/code/modules/mob/simple_animal/shade.dm @@ -5,7 +5,7 @@ icon_state = "shade" icon_living = "shade" icon_dead = "shade_dead" - max_health = 50 + maxHealth = 50 health = 50 speak_emote = list("hisses") emote_hear = list("wails","screeches") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index b25be7819d9..8ae74bf4377 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -164,9 +164,9 @@ else if (stat & MAINT) - usr << "The cover is closed. Something wrong with it: it's doesn't work." + usr << "The cover is closed. Something is wrong with it, it doesn't work." else if (malfhack) - usr << "The cover is broken. It's may be hard to force it open." + usr << "The cover is broken. It may be hard to force it open." else usr << "The cover is closed." diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 83b6b3cb51d..6991f2188c8 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -385,14 +385,12 @@ // use_power(luminosity * LIGHTING_POWER_FACTOR, LIGHT) // called when area power state changes - /obj/machinery/light/power_change() - spawn(rand(0,15)) + spawn(10) var/area/A = src.loc.loc A = A.master seton(A.lightswitch && A.power_light) - // called when on fire /obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 5ec4485619c..1c07a192929 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -188,7 +188,7 @@ display round(lastgen) and plasmatank amount attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, text2path(coin_path))) if(coins >= max_coins) - user << "\red The generator already has it's maximum amount of fuel!" + user << "\red The generator already has its maximum amount of fuel!" return coins++ user.drop_item() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 746ff36f155..1c525f22e75 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -217,7 +217,7 @@ temp_server.id_with_download += num else if(href_list["reset_tech"]) - var/choice = alert("Technology Data Rest", "Are you sure you want to reset this technology to it's default data? Data lost cannot be recovered.", "Continue", "Cancel") + var/choice = alert("Technology Data Rest", "Are you sure you want to reset this technology to its default data? Data lost cannot be recovered.", "Continue", "Cancel") if(choice == "Continue") for(var/datum/tech/T in temp_server.files.known_tech) if(T.id == href_list["reset_tech"]) @@ -226,7 +226,7 @@ temp_server.files.RefreshResearch() else if(href_list["reset_design"]) - var/choice = alert("Design Data Deletion", "Are you sure you want to delete this design? If you still have the prerequisites for the design, it'll reset to it's base reliability. Data lost cannot be recovered.", "Continue", "Cancel") + var/choice = alert("Design Data Deletion", "Are you sure you want to delete this design? If you still have the prerequisites for the design, it'll reset to its base reliability. Data lost cannot be recovered.", "Continue", "Cancel") if(choice == "Continue") for(var/datum/design/D in temp_server.files.known_designs) if(D.id == href_list["reset_design"])