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 |
|
Fermi
|
f8005dd625
|
Moved the secret cat to the respective fermi.dms.
|
2019-05-31 02:47:08 +01:00 |
|
Ghommie
|
fa4cf533cb
|
honestly AP bullet spam is ballocks too.
|
2019-05-30 20:20:05 +02:00 |
|
Ghommie
|
85ab988842
|
0, null, and "", all fulfill the ! operator.
|
2019-05-30 20:09:19 +02:00 |
|
Thalpy
|
90949f406d
|
Fixed the forceMove issue.
|
2019-05-29 20:17:22 +01:00 |
|
Thalpy
|
71eb285472
|
Few tweaks and fixes to last commits.
|
2019-05-29 20:04:52 +01:00 |
|
Thalpy
|
6811896f34
|
Bloodmath redone.
|
2019-05-29 18:30:22 +01:00 |
|
Fermi
|
ae35366e97
|
Some fixes before bed.
|
2019-05-29 05:41:12 +01:00 |
|
Fermi
|
6b4188ab86
|
British spellingggg
|
2019-05-29 04:33:46 +01:00 |
|
Fermi
|
336ba8dbad
|
Tidying code.
|
2019-05-29 02:33:15 +01:00 |
|
Trilbyspaceclone
|
5ead987d53
|
Update hierophant.dm
|
2019-05-28 19:01:32 -04:00 |
|
Trilbyspaceclone
|
69a39b4f67
|
Update hierophant.dm
|
2019-05-28 18:56:16 -04:00 |
|
Fermi
|
89665de8a7
|
Last round of test checks.
|
2019-05-28 22:33:04 +01:00 |
|
kevinz000
|
8cd0b69b61
|
adrenals
|
2019-05-28 01:00:41 -07:00 |
|
Sishen1542
|
c57968ec13
|
Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-05-28 00:29:56 -04:00 |
|
Fermi
|
8282819c84
|
CHECK PLASMA THOUGH!
|
2019-05-28 05:03:58 +01:00 |
|
Sishen
|
6707d1b2fd
|
Update species.dm
|
2019-05-27 23:24:52 -04:00 |
|
Sishen1542
|
0a11e98950
|
Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-05-27 20:53:42 -04:00 |
|
Sishen1542
|
e07493b0fa
|
Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-05-27 20:53:35 -04:00 |
|
Fermi
|
df2a14880e
|
Beginning comment purge.
|
2019-05-28 00:35:33 +01:00 |
|
Sishen
|
8771ae5822
|
masochism and buttslap fixes
|
2019-05-27 18:51:52 -04:00 |
|
kevinz000
|
76314e463e
|
Merge pull request #8443 from deathride58/stripfix
Item stripping no longer gets interrupted by changes in your actively held item
|
2019-05-27 14:08:04 -07:00 |
|