Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adds handholding #33831

Merged
merged 2 commits into from Dec 27, 2017
Merged

adds handholding #33831

merged 2 commits into from Dec 27, 2017

Conversation

silicons
Copy link
Contributor

target arms while pulling
image
image

@Hatterhat
Copy link
Contributor

he fucking did it the absolute madman

@Magikarpet
Copy link

Ban this sick filth.

@silicons
Copy link
Contributor Author

silicons commented Dec 25, 2017 •
edited

@Hatterhat fuck you greytider 🤡

@AdamElTablawy
Copy link
Contributor

  1. Erotic/creepy stuff is not allowed.
    No form of erotic roleplay is allowed on the servers, including things that could be construed as sexual by unwilling participants.

@deathride58
Copy link
Contributor

Not even Citadel's gonna accept this degeneracy.

@Doppeltongue
Copy link

Disgusting filth on one of the cleanest times of the year.

@Okand37
Copy link
Contributor

Okand37 commented Dec 25, 2017

You can just emote it if you really want then passive grab the other person/pull them.

@MrStonedOne
Copy link
Member

image

@AdamElTablawy
Copy link
Contributor

Erotic/creepy stuff is not allowed.
No form of erotic roleplay is allowed on the servers, including things that could be construed as sexual by unwilling participants.Erotic/creepy stuff is not allowed.
No form of erotic roleplay is allowed on the servers, including things that could be construed as sexual by unwilling participants.Erotic/creepy stuff is not allowed.
No form of erotic roleplay is allowed on the servers, including things that could be construed as sexual by unwilling participants.Erotic/creepy stuff is not allowed.
No form of erotic roleplay is allowed on the servers, including things that could be construed as sexual by unwilling participants.

@F-OS
Copy link
Contributor

F-OS commented Dec 25, 2017 •
edited

@kevinz000

adds handholding

911

YOU SICK FUCK

@Hatterhat
Copy link
Contributor

image
image

@Spess-Rando
Copy link
Contributor

otxfymgygq1vk041eo1

@QualityVan
Copy link
Contributor

how dare you sully the sanctity of christmas like this

@F-OS
Copy link
Contributor

F-OS commented Dec 25, 2017

@Slignerd delet this

F-OS
F-OS reviewed Dec 25, 2017
View reviewed changes
code/modules/mob/mob.dm Outdated
@@ -362,7 +362,7 @@

add_logs(src, M, "grabbed", addition="passive grab")
if(!supress_message)
visible_message("<span class='warning'>[src] has grabbed [M] passively!</span>")
visible_message("<span class='warning'>[src] has grabbed [M] passively [(zone_selected == "l_arm" || zone_selected == "r_arm")? "by their hands":""]!</span>")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

too lewd

@Hatterhat
Copy link
Contributor

image
image
image
image
image

ghost
ghost reviewed Dec 25, 2017
View reviewed changes
code/modules/mob/mob.dm
@@ -362,7 +362,7 @@

add_logs(src, M, "grabbed", addition="passive grab")
if(!supress_message)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't relevant, but I thought it might be funny if this was called suplex_message instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😂

@F-OS
Copy link
Contributor

F-OS commented Dec 25, 2017

handholding
HANDHOLDING

ERP REPORTED

@Hatterhat
Copy link
Contributor

image

@MrStonedOne
Copy link
Member

image

tgstation-server added a commit that referenced this pull request Dec 25, 2017
@tgstation-server
[ci skip] Test merge commit for pull request #33831
a2f0a8a 
Server Instance: Sybil
tgstation-server added a commit that referenced this pull request Dec 25, 2017
@tgstation-server
[ci skip] Test merge commit for pull request #33831
2839a4a 
Server Instance: Sybil
@Hatterhat
Copy link
Contributor

image
@MrStonedOne HAS GONE COMPLETELY I N S A N E

@ghost
Copy link

ghost commented Dec 25, 2017

ANYTHING BUT HAND-HOLDING
BEGONE THOTS.

@AcuteCircle
Copy link

finally playable

@FantasticFwoosh
Copy link
Contributor

FantasticFwoosh commented Dec 25, 2017 •
edited

Woah - Woah - WOAH im unwrapping my chrimbo present early of something to moan about for the remainder of this christmas season, thanks kev.

I summon thee forth @optimumtact guardian of christmas spirit.

@duncathan
Copy link
Contributor

fetish content is not allowed
I'd say "take it to citadel" but even their standards are above this

@duncathan duncathan closed this Dec 25, 2017
tgstation-server added a commit that referenced this pull request Dec 27, 2017
@tgstation-server
[ci skip] Test merge commit for pull request #33831
ec46509 
Server Instance: Sybil
@SgtxRootbeer
Copy link
Contributor

reopen!

@Hatterhat
Copy link
Contributor

keep it closed

@optimumtact optimumtact reopened this Dec 27, 2017
@optimumtact optimumtact merged commit af87ed3 into tgstation:master Dec 27, 2017
@ghost
Copy link

ghost commented Dec 27, 2017

unexpected twist??

@ghost ghost mentioned this pull request Dec 27, 2017
Closed
@CitadelStationBot CitadelStationBot mentioned this pull request Dec 27, 2017
Merged
@RepoCat RepoCat mentioned this pull request Dec 27, 2017
Merged
@ghost
Copy link

ghost commented Dec 27, 2017

madman

@optimumtact
Copy link
Member

@Wilchenx
Copy link
Contributor

Wilchenx commented Dec 27, 2017 •
edited

@optimumtact

image

@tgstation tgstation deleted a comment from Cyberboss Dec 27, 2017
@tgstation tgstation deleted a comment from Cyberboss Dec 27, 2017
@tgstation tgstation deleted a comment from Cyberboss Dec 27, 2017
@tgstation tgstation deleted a comment from Wilchenx Dec 27, 2017
@tgstation tgstation deleted a comment from Wilchenx Dec 27, 2017
Cyberboss referenced this pull request Dec 27, 2017
@optimumtact
Remove the handholding, so I can merge the pr by proxy
395ce00 
So the admin team won't let me be
Or let me be me, so let me see
They try to shut me down on OOC
But it feels so empty without me
@Cyberboss
Copy link
Member

I have won

@Hatterhat
Copy link
Contributor

Hatterhat commented Dec 27, 2017 •
edited by optimumtact

@optimumtact
>merging a PR
>a PR mainly supported by the cat discord
>a PR made by a coder in the cat discord who is a cat

smh

@Cyberboss
Copy link
Member

ITT people who don't understand git

@kyrahabattoir
Copy link
Contributor

Shouldn't this be reopened? There is clearly popular interest.

@optimumtact
Copy link
Member

that's not how this works.

the weak should fear the strong

@kyrahabattoir
Copy link
Contributor

That's not how democracy works @optimumtact.

@optimumtact
Copy link
Member

@FantasticFwoosh
Copy link
Contributor

FantasticFwoosh commented Dec 28, 2017 •
edited

Ewww.

What democracy @kyrahabattoir even i can accept the notion is a lame joke.

@ghost
Copy link

ghost commented Dec 28, 2017 •
edited by ghost

@kyrahabattoir since when is this a democracy

@ghost ghost deleted the patch-414 branch December 28, 2017 16:20
@Hatterhat
Copy link
Contributor

nice

@SumWhan
Copy link

SumWhan commented Dec 31, 2017

Did someone say they needed a dose of freedom?
democracy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@F-OS F-OS F-OS left review comments

@CosmicScientist CosmicScientist CosmicScientist left review comments

@Hatterhat Hatterhat Hatterhat left review comments

Assignees
No one assigned
Labels
Feature Exposes new bugs in interesting ways
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet