[READY TO MERGE] more flavor text fixes round 2 #13126

Wizardcrying · 2016-12-28T08:02:36Z

revival of old PR
fixes some flavor text stuff and also triggers celt/fixes two bugs related to the KEEPER AI module's name and examine text (the module of which shouldn't be tangible but is on box centcomm anyway, why)

update: fixed the removal of flavor

ghost · 2016-12-28T11:03:28Z

code/WorkInProgress/pomf/spacepods/spacepods.dm

 		if("pod_gold")
-			desc = "A civilian space pod with a gold body, must have cost somebody a pretty penny"


Removing fun

I'd personally say keep the original wording and just fix the comma splice and missing period.

ghost · 2016-12-28T11:03:53Z

code/WorkInProgress/pomf/spacepods/spacepods.dm

@@ -357,17 +357,17 @@
 */
 	for(var/mob/living/carbon/slime/M in range(1,usr))
 		if(M.Victim == usr)
-			to_chat(usr, "You're too busy getting your life sucked out of you.")
+			to_chat(usr, "You attempt to enter \the [src.name], but [M.name] pulls you back!")


Removing fun

\the [src.name] doesn't work.

ghost · 2016-12-28T11:04:06Z

code/WorkInProgress/pomf/spacepods/spacepods.dm


 	if(enter_after(40,usr))
 		if(!src.occupant)
 			moved_inside(usr)
 		else if(src.occupant!=usr)
-			to_chat(usr, "[src.occupant] was faster. Try better next time, loser.")
+			to_chat(usr, "[src.occupant] has already entered the pod.")


Removing fun

ghost · 2016-12-28T11:05:25Z

code/game/objects/items/weapons/cigs_lighters.dm

@@ -407,7 +407,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM

 /obj/item/clothing/mask/cigarette/cigar
 	name = "Premium Cigar"
-	desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!"
+	desc = "A large roll of tobacco and chemicals."


Removing fun

ghost · 2016-12-28T11:06:40Z

code/modules/admin/admin.dm

@@ -786,13 +786,13 @@ var/global/floorIsLava = 0
 			<BR>
 			<A href='?src=\ref[src];secretsfun=hardcore_mode'>[ticker&&ticker.hardcore_mode ? "Disable" : "Enable"] hardcore mode (makes starvation kill!)</A><BR>
 			<A href='?src=\ref[src];secretsfun=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
-			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode</A><BR>
+			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode (all-access for everyone)</A><BR>


It removes door access, not gives all access

All door access but command and sec iirc

ghost · 2016-12-28T11:08:14Z

code/modules/mob/living/simple_animal/friendly/crab.dm

@@ -88,7 +88,7 @@

 /mob/living/simple_animal/crab/snowy
 	name = "Snowy"
-	desc = "While you'd think that most crabs in cold climates would stick to the relatively warmer water, this one's adapted to living on the land and has camouflage to boot"
+	desc = "A crab with a white shell."


Removing fun

ghost · 2016-12-28T11:08:40Z

code/modules/reagents/reagent_dispenser.dm

@@ -255,7 +255,7 @@

 /obj/structure/reagent_dispensers/beerkeg
 	name = "beer keg"
-	desc = "A beer keg"
+	desc = "A massive keg containing beer."


May not necessarily contain beer

labeled as or something

BestName · 2016-12-28T15:53:23Z

code/game/gamemodes/cult/cult_items.dm

 	icon_state = "cult_armour"
 	item_state = "cult_armour"
-	desc = "A bulky suit of armour, bristling with spikes. It looks space proof."
+	desc = "A bulky suit of armor covered in spikes. It looks space proof."


BestName · 2016-12-28T15:53:42Z

code/game/gamemodes/cult/talisman.dm

@@ -127,7 +127,7 @@
 <A href='?src=\ref[src];rune=runestun'>Fuu ma'jin</A> - Allows you to stun a person by attacking them with the talisman.<BR>
 <A href='?src=\ref[src];rune=soulstone'>Kal om neth</A> - Summons a soul stone<BR>
 <A href='?src=\ref[src];rune=construct'>Da A'ig Osk</A> - Summons a construct shell for use with captured souls. It is too large to carry on your person.<BR>"}
-//<A href='?src=\ref[src];rune=armor'>Sa tatha najin</A> - Allows you to summon armoured robes and an unholy blade<BR> //Kept for reference
+//<A href='?src=\ref[src];rune=armor'>Sa tatha najin</A> - Allows you to summon armored robes and an unholy blade<BR> //Kept for reference


It's even commented out, the heck is this?

The good ol' find and replace.

I did it just to piss Celt off. I didn't use find and replace.

BestName

Patriotic/10
God bless America.

ghost · 2016-12-28T16:27:07Z

make a grammar PR

misspell words

Shaking my head to be honest

Intigracy · 2016-12-28T16:26:22Z

code/modules/admin/admin.dm

@@ -786,13 +786,13 @@ var/global/floorIsLava = 0
 			<BR>
 			<A href='?src=\ref[src];secretsfun=hardcore_mode'>[ticker&&ticker.hardcore_mode ? "Disable" : "Enable"] hardcore mode (makes starvation kill!)</A><BR>
 			<A href='?src=\ref[src];secretsfun=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
-			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode</A><BR>
+			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode (all-access for everyone)</A><BR>


All door access but command and sec iirc

Intigracy · 2016-12-28T16:27:31Z

code/modules/clothing/shoes/magboots.dm

@@ -102,7 +102,7 @@
 //Syndicate
 /obj/item/clothing/shoes/magboots/syndie
 	name = "blood-red magboots"
-	desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."


At least describe it as being a tag on the tongue.

Intigracy · 2016-12-28T16:32:44Z

code/modules/reagents/reagent_dispenser.dm

@@ -255,7 +255,7 @@

 /obj/structure/reagent_dispensers/beerkeg
 	name = "beer keg"
-	desc = "A beer keg"
+	desc = "A massive keg containing beer."


labeled as or something

Wizardcrying · 2016-12-28T20:08:58Z

I wasn't lying when I wrote

triggers celt

Now I can make that

triggers celt AND bestname

Exxion · 2016-12-28T21:41:20Z

code/WorkInProgress/pomf/spacepods/spacepods.dm

@@ -357,17 +357,17 @@
 */
 	for(var/mob/living/carbon/slime/M in range(1,usr))
 		if(M.Victim == usr)
-			to_chat(usr, "You're too busy getting your life sucked out of you.")
+			to_chat(usr, "You attempt to enter \the [src.name], but [M.name] pulls you back!")


I was being serious. It should be \the [src] and \the [M]

Exxion · 2016-12-28T21:41:44Z

code/WorkInProgress/pomf/spacepods/spacepods.dm

 			return
 //	to_chat(usr, "You start climbing into [src.name]")

-	visible_message("<span class='notice'>[usr] starts to climb into [src.name]</span>")
+	visible_message("<span class='notice'>[usr] starts to climb into [src.name].</span>")


\the [src]

Exxion · 2016-12-28T21:42:20Z

code/WorkInProgress/pomf/spacepods/spacepods.dm

@@ -343,7 +343,7 @@
 		if(occupant == usr)
 			move_outside(usr)
 		else
-			to_chat(usr, "<span class='notice'><B>The [src.name] is already occupied!</B></span>")
+			to_chat(usr, "<span class='notice'><B>\The [src.name] is already occupied!</B></span>")


Remove .name

Wizardcrying · 2016-12-28T21:51:53Z

god damn it @skullyton you commented on the removal and not the addition

PJB3005 · 2016-12-30T00:42:51Z

code/game/objects/items/weapons/shields.dm

@@ -132,7 +132,7 @@

 /obj/item/weapon/cloaking_device
 	name = "cloaking device"
-	desc = "Use this to become invisible to the human eyesocket."
+	desc = "A device that completely hides a user."


"Use this to become invisible to the human eye"?

PJB3005 · 2016-12-30T00:43:29Z

code/modules/clothing/spacesuits/alien.dm

@@ -123,7 +123,7 @@

 /obj/item/clothing/shoes/magboots/vox

-	desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor."
+	desc = "A pair of heavy, jagged armored foot pieces."


PJB3005 · 2016-12-30T00:44:03Z

code/modules/projectiles/guns/projectile/automatic.dm

@@ -78,7 +78,7 @@

 /obj/item/weapon/gun/projectile/automatic/mini_uzi
 	name = "Uzi"
-	desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
+	desc = "A lightweight, fast firing gun. Uses .45 rounds."


PJB3005 · 2016-12-30T00:44:12Z

code/modules/projectiles/guns/projectile/automatic.dm

@@ -95,7 +95,7 @@

 /obj/item/weapon/gun/projectile/automatic/c20r
 	name = "\improper C-20r SMG"
-	desc = "A lightweight, fast firing gun, for when you REALLY need someone dead. Uses 12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp"
+	desc = "A lightweight, fast firing gun. Uses 12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."


Also if you're gonna revert this, maybe consider making the REALLY into <b>really</b> for fancy styling.

Shadowmech88 · 2016-12-30T00:51:54Z

fixes some flavor text stuff

That's a funny way to say "unnecessarily makes a bunch of descriptions clinical and boring."

Wizardcrying · 2016-12-30T00:57:34Z

@Shadowmech88 Bauds' recent comment explained why these descriptions exist. Thanks @9600bauds.

9600bauds · 2016-12-30T00:59:01Z

Again sorry for the original dumb "whyy" comment, I woke up annoyed at things entirely unrelated to spess. Just by making a proper comment we are already all communicating better.

Shadowmech88 · 2016-12-30T01:29:56Z

code/defines/obj/weapon.dm

@@ -860,7 +860,7 @@

 /obj/item/weapon/ectoplasm
 	name = "ectoplasm"
-	desc = "The remnants of a being between the world of the dead and that of the living. Spooky."


Why remove this?

That was a change I made. It was previously just desc = "spooky". I suppose this could be a useful description.

If it didn't have it originally, then I don't mind. Whatever you feel like.

It is too wordy, for one.

Wizardcrying · 2016-12-30T01:45:25Z

That's it for this PR.

9600bauds · 2016-12-30T02:04:51Z

Everyone satisfied now?

Shadowmech88 · 2016-12-30T02:08:51Z

code/WorkInProgress/pomf/spacepods/spacepods.dm

 		if("pod_mil")
-			desc = "A dark grey space pod brandishing the Nanotrasen Military insignia"


"Military" may have been correct here, in the same vein as "United States Armed Forces."

The capitalization seemed off, since there's been no mention of the "Nanotrasen Military" from what I've seen.

If it's THE Nanotrasen Military insignia, I think that's the name of it.

Or it's just laziness and not describing the insignia correctly.

I've never heard "Nanotrasen Military" used before, so I think it's the latter. "Nanotrasen Enforcement and Protection Division" or something shorter, perhaps?

Wizardcrying · 2016-12-30T02:11:09Z

@9600bauds The only downvoters who have commented on this are Celt and Shadowmech, so probably unless any others say something.

Aurantiaco · 2016-12-30T02:31:20Z

We must delete fun at once.

Wizardcrying · 2016-12-30T02:39:44Z

@Aurantiaco Why do you propose this and how do you propose going about it?

Aurantiaco · 2016-12-30T02:51:36Z

I say that we remove anything that causes enjoyment among players with swiftness. Fun is a toxic, horrible thing that has no reason to exist in space. My family was murdered by fun. Literally. They were playing hopscotch in the street, talking about how fun it was, when a drunk driver hit them with a car. Fun killed them.

Also this is just hyperbole I have few problems with the actual PR.

Wizardcrying · 2016-12-30T02:55:32Z

@Aurantiaco That's pretty sad. I'll get to work on removing fun ASAP.

What are your specific issues?

Aurantiaco · 2016-12-30T03:20:23Z

People have too much fun with

combat

being an antag

playing space

we must delete the game at once.

Wizardcrying · 2016-12-30T03:22:43Z

@Aurantiaco what about the PR?

Aurantiaco · 2016-12-30T03:40:50Z

nah this is fine merge it

Wizardcrying · 2016-12-30T03:48:27Z

ok

ghost · 2016-12-30T21:14:32Z

Still mispelling armour deliberately

ultraplen · 2016-12-31T12:55:34Z

deleting fun flavour texts in favour of boring ones

delete this

edit: never mind, after actually reading through all the changes in the latest commit they seem fine

9600bauds · 2016-12-31T18:02:13Z

Shame about part 1 not getting the FUN intervention

* look at the branch name of the last pr and this one * fix and add * added one * cabinet * more * flavor text and KEEPER AI module bugfix but why? * \the * real flavor text hours also secrets and an email account * ace coder over here * revert fun removal and fix things * cig * let's see if this resolves inti's remaining change * oh hey pomf copy-pasted from mecha.dm * this didn't commit wtf * "whyyyyyyy", said the bauds. and nothing got done that day * there was even another src.name * exxion * revert fun description removal * whoops didn't commit vox change * spooky

Wizardcrying added 9 commits December 22, 2016 11:46

look at the branch name of the last pr and this one

ba95813

fix and add

4b25db6

added one

29c86cf

cabinet

1f51275

more

8fa9a8e

flavor text and KEEPER AI module bugfix but why?

d20dc12

\the

c766442

real flavor text hours also secrets and an email account

59539bb

ace coder over here

b99c86c

ghost reviewed Dec 28, 2016

View reviewed changes

BestName reviewed Dec 28, 2016

View reviewed changes

BestName approved these changes Dec 28, 2016

View reviewed changes

Probe1 added the Grammar / Formatting We is very good at write sentence. label Dec 28, 2016

Intigracy previously requested changes Dec 28, 2016

View reviewed changes

revert fun removal and fix things

b0c557f

Exxion requested changes Dec 28, 2016

View reviewed changes

Wizardcrying added 2 commits December 28, 2016 13:44

cig

fdc410b

let's see if this resolves inti's remaining change

1490b8b

Wizardcrying added 2 commits December 28, 2016 13:55

oh hey pomf copy-pasted from mecha.dm

e7185c2

this didn't commit wtf

3f22cc9

PJB3005 reviewed Dec 30, 2016

View reviewed changes

Wizardcrying added 2 commits December 29, 2016 17:00

revert fun description removal

b041da3

whoops didn't commit vox change

5f7ab97

Shadowmech88 reviewed Dec 30, 2016

View reviewed changes

spooky

b87d730

Wizardcrying changed the title ~~[don't merge] more flavor text fixes round 2~~ [READY TO MERGE] more flavor text fixes round 2 Dec 30, 2016

Shadowmech88 reviewed Dec 30, 2016

View reviewed changes

PJB3005 approved these changes Dec 30, 2016

View reviewed changes

9600bauds merged commit 063981f into vgstation-coders:Bleeding-Edge Dec 31, 2016

		if("pod_gold")
		desc = "A civilian space pod with a gold body, must have cost somebody a pretty penny"

		if("pod_mil")
		desc = "A dark grey space pod brandishing the Nanotrasen Military insignia"

[READY TO MERGE] more flavor text fixes round 2 #13126

[READY TO MERGE] more flavor text fixes round 2 #13126

Conversation

Wizardcrying commented Dec 28, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wizardcrying Dec 28, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wizardcrying Dec 29, 2016 • edited

Choose a reason for hiding this comment

BestName left a comment • edited

Choose a reason for hiding this comment

ghost commented Dec 28, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wizardcrying commented Dec 28, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wizardcrying commented Dec 28, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Shadowmech88 commented Dec 30, 2016

Wizardcrying commented Dec 30, 2016

9600bauds commented Dec 30, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wizardcrying commented Dec 30, 2016

9600bauds commented Dec 30, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wizardcrying commented Dec 30, 2016 • edited

Aurantiaco commented Dec 30, 2016

Wizardcrying commented Dec 30, 2016

Aurantiaco commented Dec 30, 2016

Wizardcrying commented Dec 30, 2016

Aurantiaco commented Dec 30, 2016

Wizardcrying commented Dec 30, 2016

Aurantiaco commented Dec 30, 2016

Wizardcrying commented Dec 30, 2016

ghost commented Dec 30, 2016

ultraplen commented Dec 31, 2016 • edited

9600bauds commented Dec 31, 2016

Wizardcrying commented Dec 28, 2016 •

edited

Wizardcrying Dec 28, 2016 •

edited

Wizardcrying Dec 29, 2016 •

edited

BestName left a comment •

edited

Wizardcrying commented Dec 30, 2016 •

edited

ultraplen commented Dec 31, 2016 •

edited