kevinz000
|
9edac9fc6c
|
Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
|
2019-06-08 01:17:04 -07:00 |
|
kevinz000
|
61d0ac9993
|
Merge pull request #8476 from Trilbyspaceclone/patch-157
Tweaks/Buffs hierophant
|
2019-06-08 01:05:28 -07:00 |
|
deathride58
|
1dde6b90ae
|
Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
|
2019-06-08 01:37:29 -04:00 |
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
Trilbyspaceclone
|
79a456a0ac
|
Update carbon_defense.dm
|
2019-06-07 18:29:42 -04:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Ghommie
|
56be73f7e0
|
Lord Travis Hath Spoken.
|
2019-06-07 07:44:33 +02:00 |
|
Ghommie
|
92e925f1f7
|
Stuff to fix, fools to blame.
|
2019-06-07 07:14:24 +02:00 |
|
Poojawa
|
c2cf8b28df
|
KISS principal
|
2019-06-06 21:35:50 -05:00 |
|
Ghommie
|
455332a717
|
movin back to the core when selecting a new display.
|
2019-06-07 04:20:15 +02:00 |
|
Ghommie
|
0b53df47de
|
Enough clowning around.
|
2019-06-07 03:22:26 +02:00 |
|
Poojawa
|
2e42656b6d
|
Revert "lel"
This reverts commit 9e01a078ec.
|
2019-06-06 19:40:08 -05:00 |
|
Poojawa
|
6b82c985ae
|
Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
|
2019-06-06 19:39:22 -05:00 |
|
Poojawa
|
67eb76b360
|
clarifies a few things
|
2019-06-06 18:56:26 -05:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
kevinz000
|
31a942a63a
|
Merge pull request #8534 from dtfe3/dtfe3-pink-panties
Pink Panties
|
2019-06-06 06:52:57 -07:00 |
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
BurgerLua
|
8778349821
|
added
|
2019-06-05 11:43:28 -07:00 |
|
dtfe3
|
3de6e2d71a
|
twintails...
title
|
2019-06-05 19:41:23 +02:00 |
|
Ghommie
|
af2598035a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-05 19:32:17 +02:00 |
|
dtfe3
|
d1d0f38460
|
Revert "test"
|
2019-06-05 19:29:53 +02:00 |
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
dtfe3
|
2e47c973c6
|
Pink Panties
|
2019-06-05 16:15:38 +02:00 |
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
kevinz000
|
2c84d75ae6
|
Merge pull request #8528 from Poojawa/marking-mysteries
Fixes prosthetic invisible hands, improves female markings
|
2019-06-05 02:02:40 -07:00 |
|
kevinz000
|
980c48180c
|
Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
|
2019-06-05 01:55:19 -07:00 |
|
kevinz000
|
89bf36e6a9
|
Merge pull request #8491 from Ghommie/Ghommie-cit24
zero, , null, and empty text strings, all fulfill the ! operator.
|
2019-06-05 01:52:17 -07:00 |
|
kevinz000
|
adbbb2944a
|
Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
|
2019-06-05 01:42:48 -07:00 |
|
kevinz000
|
58bdac6965
|
Merge pull request #8524 from BurgerLUA/Ass-Blast-USA
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
|
2019-06-05 01:40:28 -07:00 |
|
kevinz000
|
81ba2011d3
|
Merge pull request #8510 from Sishen1542/ghostmanbad
Subtle 2: No Ghost Boogaloo
|
2019-06-05 01:32:42 -07:00 |
|
Poojawa
|
a2b4f4261c
|
Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
|
2019-06-05 02:33:25 -05:00 |
|
Poojawa
|
9e01a078ec
|
lel
|
2019-06-03 20:06:25 -05:00 |
|
BurgerLua
|
ed7d0575b2
|
Ass Blast USA
|
2019-06-03 14:40:57 -07:00 |
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05:00 |
|
Fermi
|
1a73cf6efe
|
This is why you compile test.
|
2019-06-02 21:09:31 +01:00 |
|
Fermi
|
c11d2bac80
|
Okay, now it checks the right thing.
|
2019-06-02 21:03:16 +01:00 |
|
Fermi
|
5b56225b72
|
Wait how can the dead inspect?
|
2019-06-02 21:01:05 +01:00 |
|
Thalpy
|
e0690c610a
|
Added a check to ensure empath target isn't dead.
|
2019-06-02 20:53:41 +01:00 |
|
Thalpy
|
abb76baeca
|
Update code/modules/mob/living/carbon/human/examine.dm
Ghoomie's change.
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-06-02 19:14:08 +01:00 |
|
Poojawa
|
17ad519f24
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess
|
2019-06-02 03:00:46 -05:00 |
|
Sishen
|
9347ad57b1
|
sneaky erp
|
2019-06-01 20:20:55 -04:00 |
|
Fermi
|
5918b026aa
|
Fixes, PLEASE CHECK HEADPATS IN MOODULAR.
|
2019-06-01 20:02:51 +01:00 |
|
Fermi
|
f8586c9699
|
Adds Friendly and empahty quirk from tg.
|
2019-06-01 18:51:25 +01:00 |
|
Fermi
|
44d13818f0
|
Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140)
|
2019-06-01 16:52:58 +01:00 |
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
kevinz000
|
32f6427cf1
|
Merge pull request #8434 from Ghommie/Ghommie-cit16
I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.
|
2019-05-31 18:00:47 -07:00 |
|
Fermi
|
2eceb6f57b
|
Added a cybernetic tongue and sprites. Fixed furranium.
|
2019-06-01 01:28:52 +01:00 |
|
Fermi
|
abfcc25e91
|
No changed, just staching a comment.
|
2019-05-31 23:54:30 +01:00 |
|
Fermi
|
e1577111a0
|
TO BE TESTED: Added the ability for slimes to make MKUltra.
|
2019-05-31 05:09:07 +01:00 |
|