[NEEDS REVIEW] [INSERT NAME HERE] revisited #15726

MadmanMartian · 2017-08-16T01:38:51Z

revisit of #14499

Discussion issue/thread: #10403

Not too sure where to start, so fixed the compile issues and am going to sleep on it

Status Update
~~They're functional. They do need some TLC on the HUD, and how they show their weapons, as the arms can sometimes overlay themselves above the held item sprites~~

Lot of sanity apparently required

TODO

It's Life() Jim, but not as we know it
How the fuck do squid breath?
How the fuck do squid deal with damage?
How the fuck do squid do anything, for that matter?
Slips are the number one enemy to squids, as they have no slot besides a hat slot and hands
How the fuck do we find the squid?

FIX LIST

IT'S A FEAAATUUUURE

Permanently statued if touching a cockatrice. The same can be said for most other animals.
Immune to facehugging / alien disease. No face to hug
Immune to genetics. Not the same genetic structure. Whichever deity dropped species with similar genetic code all across the galaxy must have something nefarious in mind
They don't have blood
hasorgans() returns false because they aren't human - Because no surgery. Maybe they have no organs?
No surgery - Because hasorgans returns ishuman
No defibbing - 'Octopuses have three hearts; a systemic heart that circulates blood round the body and two branchial hearts that pump it through each of the two gills.' - https://en.wikipedia.org/wiki/Octopus
Can't be wrapped in wrapping paper
Immune to shard damage - Unable to sort this without making the PR unatomic

# Conflicts: # cfg/admin.txt # code/modules/mob/mob_helpers.dm

jknpj · 2017-08-16T01:46:48Z

vgstation13.dme

@@ -2219,7 +2226,7 @@
 #include "interface\web\interface.dms"
 #include "maprendering\maprendering.dm"
 #include "maps\_map.dm"
-#include "maps\tgstation.dm"
+#include "maps\test_tiny.dm"


yeah, don't do this

Obviously the reason it's included is that he was doing testing

It's good to point out so he doesn't forget to remove it, but you've been around to know 'why'

Sorry, it was in the merge commit along with the admin file. This is all basically raw pulled from unids old PR

Exxion · 2017-08-16T02:00:24Z

cfg/admin.txt

+abi79 role=admin
+arcalane role=admin
+asanadas role=admin
+bobbehluvspropane role=admin


First of all, fuck this file. It's started appearing recently. I don't really know why. BYOND update or something? It got added to .gitignore but apparently everyone still has to do something to refresh their repos or something to make it stop adding itself. I don't really know how Git works, honestly.

Second, this is one of the worst ckeys I've ever seen

This file didn't exist until 211a1db and actually isn't in .gitignore

Okay, this file specifically is used for access to the Reboot/Profile buttons through DM.

Also it is in .gitignore my bad, people just need to update their .gitignores since pulling from the repo doesn't work since .gitignore ignores itself lmao.

Also it is in .gitignore my bad, people just need to update their .gitignores since pulling from the repo doesn't work since .gitignore ignores itself lmao.

That's only if you gitignore the gitignore, which is already your own fault.

ghost · 2017-08-16T02:07:30Z

dear god

SonixApache · 2017-08-17T09:47:45Z

end this fucking name

SonixApache · 2017-08-17T21:59:12Z

thank you

ghost · 2017-08-18T03:39:30Z

Don't you disrespect the dead like that @SonixApache

SonixApache · 2017-08-18T06:32:20Z

your memes are stale and unfunny

ghost · 2017-08-18T16:16:07Z

theyre literally called scootaloos change the title back

MadmanMartian · 2017-08-18T20:49:51Z

code/modules/mob/living/carbon/martian/martian.dm

@@ -47,7 +47,8 @@

 /mob/living/carbon/martian/New()
 	create_reagents(200)
-
+	name = pick("martian","scootaloo","squid","rootmarian","phoronitian","sepiida","octopodiforme",\
+	"bolitaenides","belemnites","astrocanthoteuthis","octodad","ocotillo")


Are people satisfied now?

JUSTADDITYOUMEMELORDS · 2017-08-19T00:25:38Z

JUST ADD IT YOU MEME LORDS

MusgardTiger · 2017-08-19T18:12:31Z

How the fuck do squid breath?
They should breathe good ole oxygen but I'll leave how to deal with the unfortunate reality of having to stick an oxygen tank up their throats.

How the fuck do squid deal with damage?
Their limbs should be very strong but their floff bodies should be weaker. They should also have every organ they need in their heads. Hull breaches are also very common so are Martians going to get fucked over whenever there is a hull breach? I guess they can rely on chemicals?

How the fuck do squid do anything, for that matter?
Having a lot of hands means they can carry a lot of containers, so that can be very useful for literally any department other than security and engineering. So if they are gonna be a station race they should be restricted from engineering and security because engineers are dependant on rig suits more or less for anything they do other than antimatter engine and security cannot afford to spill their stuff on the ground whenever they get stunned/disarmed. Their bites should be powerful because of their beaks.

Slips are the number one enemy to squids, as they have no slot besides a hat slot and hands
They need some sort of armband for id cards if they are gonna be station race, people disarm for fun and it'll not be so fun for scondaloos if they drop their id along with everything they carry whenever somebody gets bored.

How the fuck do we find the squid?
I was thinking about an outpost like trader outpost but now that I am thinking, it'd be better if we had on station tbqh mainly because I have no idea for what martians can do in an outpost that current races can't.

SonixApache · 2017-08-20T04:04:32Z

just make them stun proof (as in, can't fall over, but still immobilized)

…visual of whether or not you have a tank installed.

MadmanMartian · 2017-08-23T15:35:06Z

A binary file conflict? How horrible!

Intigracy · 2017-08-26T20:51:18Z

By making them not a species of human they're going to fail every ishuman() check.
If you intend them to behave like monkies, the same is true for all the ismonkey() checks.

Some of these may be intended, but I doubt all of them are.

Immune to most diseases
Immune to facehugging / alien disease
Permanently statued if touching a cockatrice
Immune to quite a few wizard spells
They don't have blood
Can't use bodybags
Immune to mousetraps
Can't use megaphones
Immune to slime stunning from melee combat
Can't put people in sleepers
Can't be wrapped in wrapping paper
No surgery
Can't use the null rod
Even if you do give them the ID slot back, it won't function on doors/vending machines while worn
hasorgans() returns false because they aren't human
Can't be buckled into wheelchairs
Immune to genetics
Immune to shard damage
No defibbing

There's a LOT more

MadmanMartian · 2017-08-26T21:07:46Z

Oh, wow, you've got a point there

MadmanMartian · 2017-08-26T21:08:38Z

code/modules/mob/living/carbon/martian/inventory.dm

+
+	return ACL
+
+/mob/living/carbon/martian/get_visible_id()


Do doors and vending machines not use this then?

That one probably works then.

Shadowmech88 · 2017-08-26T23:12:20Z

It'd probably be best to make them a species of human and just alter human code so that it doesn't assume stuff like the presence of limbs or what inventory slots a human has. Such things could be moved into species datums.

Iamgoofball · 2017-09-12T19:09:34Z

was i pinged at any point here, github is marking this as a participating for whatever reason

MadmanMartian · 2017-09-14T10:22:25Z

general plan for the last tick is something that requires the infamous antag datums, so stay tuned

SonixApache · 2017-09-14T14:19:27Z

squid datums?

PJB3005 · 2017-09-14T14:37:30Z

Splatoon in SS13 when?

…

On 14 Sep 2017 16:19, "SonixApache" ***@***.***> wrote: squid datums? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#15726 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AHu1w-bK2j15-Jld758GeMwZLlWid-oyks5siTXygaJpZM4O4T1r> .

SonixApache · 2017-09-14T16:28:37Z

soon as this is merged, i guess

PJB3005 · 2017-09-14T20:15:21Z

But where is my ink and ability to be a kid?

SonixApache · 2017-09-14T22:12:29Z

pen + genetics

MadmanMartian · 2017-10-10T16:02:03Z

oh bollocks

MadmanMartian · 2017-10-10T23:12:21Z

I'm not sure how, but I managed to entirely remove my work on martians

MadmanMartian · 2017-10-10T23:52:58Z

and that's fixed it.

Not sure how, but it's fixed

SonixApache · 2017-10-11T01:44:49Z

wait what

MadmanMartian · 2017-10-12T23:15:57Z

Can technically 'find' squid now, as an equivalent to the mommi fab now added

Shadowmech88 · 2017-10-15T23:35:25Z

Just out of curiosity, why were these made /carbons rather than a species of human?
I think I've asked before, but I don't remember what the answer was.

MadmanMartian · 2017-10-15T23:42:17Z

For them to be made a subtype of human would be to strip out a lot of vars, such as the inventory slots, redo of the hand slots, etc.

Was easier to just make them a subtype of carbon and only add half the fluff, than make them a subtype of human and spend more time filtering the spaghetti code to be pure penne

Shadowmech88 · 2017-10-16T00:39:33Z

I imagine a lot of ishuman() checks were made into iscarbon() in order to allow the martians to do things.
Have the abilities of monkeys, slimes, and xenos, which are also carbons, changed due to this?

MadmanMartian · 2017-10-16T00:40:27Z

nope, ismartian() was added alongside most of the ishuman checks

Shadowmech88 · 2017-10-16T02:02:25Z

It might have been a better idea to make an ishigherbeing() or something check which calls both ishuman() and ismartian().

MadmanMartian · 2017-10-16T10:28:31Z

you've had 2 months to make these sorts of suggestions, why wait until it's merged?

Shadowmech88 · 2017-10-16T10:40:51Z

I mostly just forgot it existed until it was merged and everyone started talking about it.
I don't expect you to go back and change it now, I was just offering a thought.

unid15 and others added 4 commits March 28, 2017 20:56

Scootaloos 1

d0506de

Adds new files

53f01d5

Merge remote-tracking branch 'unidrepo/scootaloo' into scooty

2cf2d74

# Conflicts: # cfg/admin.txt # code/modules/mob/mob_helpers.dm

fixes compile issues

05b827f

jknpj reviewed Aug 16, 2017

View reviewed changes

Exxion reviewed Aug 16, 2017

View reviewed changes

Intigracy added the Content Adds something. Neat! label Aug 16, 2017

merge commit

05a01f1

MadmanMartian changed the title ~~Scootaloos(?) revisited~~ [REDACTED] revisited Aug 17, 2017

MadmanMartian changed the title ~~[REDACTED] revisited~~ [INSERT NAME HERE] revisited Aug 18, 2017

solves the name debacle once and for all

f3d1ccd

MadmanMartian commented Aug 18, 2017

View reviewed changes

N3X15 added Needs Fixing ✋ Do Not Merge ✋ Don't you do it. labels Aug 20, 2017

MadmanMartian added 2 commits August 21, 2017 00:08

It's life() jim, but not as we know it

6d662c3

fixes HUD, fixes stat, fixes health display. Helmet now has a better …

a348396

…visual of whether or not you have a tank installed.

MadmanMartian commented Aug 26, 2017

View reviewed changes

merge to new laptop

332cf83

MadmanMartian added 2 commits October 11, 2017 15:16

Fixes the last few points. now for live testing

867688d

adds the martian printer

0992a5e

MadmanMartian changed the title ~~[INSERT NAME HERE] revisited~~ [NEEDS REVIEW] [INSERT NAME HERE] revisited Oct 13, 2017

Merge branch 'Bleeding-Edge' into scooty

fb0b65d

N3X15 approved these changes Oct 15, 2017

View reviewed changes

N3X15 removed Needs Fixing ✋ Do Not Merge ✋ Don't you do it. labels Oct 15, 2017

N3X15 merged commit a50a28e into vgstation-coders:Bleeding-Edge Oct 15, 2017

MadmanMartian deleted the scooty branch October 16, 2017 00:05

DamianX mentioned this pull request Feb 21, 2018

Martians megathread #10403

Closed

[NEEDS REVIEW] [INSERT NAME HERE] revisited #15726

[NEEDS REVIEW] [INSERT NAME HERE] revisited #15726

Conversation

MadmanMartian commented Aug 16, 2017 • 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

Intigracy Aug 16, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Aug 16, 2017

SonixApache commented Aug 17, 2017

SonixApache commented Aug 17, 2017

ghost commented Aug 18, 2017

SonixApache commented Aug 18, 2017

ghost commented Aug 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JUSTADDITYOUMEMELORDS commented Aug 19, 2017

MusgardTiger commented Aug 19, 2017

SonixApache commented Aug 20, 2017 • edited

MadmanMartian commented Aug 23, 2017

Intigracy commented Aug 26, 2017 • edited

MadmanMartian commented Aug 26, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Shadowmech88 commented Aug 26, 2017

Iamgoofball commented Sep 12, 2017 • edited

MadmanMartian commented Sep 14, 2017

SonixApache commented Sep 14, 2017

PJB3005 commented Sep 14, 2017 via email

SonixApache commented Sep 14, 2017

PJB3005 commented Sep 14, 2017

SonixApache commented Sep 14, 2017

MadmanMartian commented Oct 10, 2017

MadmanMartian commented Oct 10, 2017

MadmanMartian commented Oct 10, 2017

SonixApache commented Oct 11, 2017

MadmanMartian commented Oct 12, 2017

Shadowmech88 commented Oct 15, 2017

MadmanMartian commented Oct 15, 2017

Shadowmech88 commented Oct 16, 2017 • edited

MadmanMartian commented Oct 16, 2017

Shadowmech88 commented Oct 16, 2017

MadmanMartian commented Oct 16, 2017

Shadowmech88 commented Oct 16, 2017

MadmanMartian commented Aug 16, 2017 •

edited

Intigracy Aug 16, 2017 •

edited

SonixApache commented Aug 20, 2017 •

edited

Intigracy commented Aug 26, 2017 •

edited

Iamgoofball commented Sep 12, 2017 •

edited

Shadowmech88 commented Oct 16, 2017 •

edited