Commit Graph

9278 Commits

Author SHA1 Message Date
deathride58
98304e4975 Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port
Ctrl Alt Click on pipes, port from TG
2019-06-05 12:54:36 -04:00
dtfe3
2e47c973c6 Pink Panties 2019-06-05 16:15:38 +02:00
Poojawa
27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
Trilbyspaceclone
f6c7eeb4da Update mining_tools.dm 2019-06-05 09:06:47 -04: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
3ab46405b8 Merge pull request #8489 from Coolgat3/tacticalwear
Makes combat gloves look T A C T I C O O L
2019-06-05 01:49:57 -07:00
kevinz000
98491cd2f8 Merge pull request #8504 from Trilbyspaceclone/patch-160
buffs resonator
2019-06-05 01:49:11 -07:00
kevinz000
cd38a29449 Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
2019-06-05 01:44:05 -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
102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
2019-06-05 01:41:23 -07:00
kevinz000
52b189dc98 Merge pull request #8502 from Sishen1542/meatyors
Meteor Sats not exclusive to station goal
2019-06-05 01:40:50 -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
b053fe3c86 Probably fixes synth hand issues 2019-06-04 23:36:58 -05:00
Fermi
228ab5b7c9 +Acute hepatic pharmacokinesis. (untested, will test with alterations)CC 2019-06-05 00:23:42 +01:00
Trilbyspaceclone
da67bdf63d >_> 2019-06-04 12:40:29 -04:00
Trilbyspaceclone
7fb1f7fba1 Update snacks_pastry.dm 2019-06-03 18:38:55 -04:00
BurgerLua
ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
Useroth
ebb820ed38 Made the changeling tentacle disarm a bit more reliable. 2019-06-03 22:56:01 +02:00
kevinz000
fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
2019-06-03 00:51:36 -07:00
Ghommie
a0898a779a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:48:38 +02: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
Fermi
e607cd3c7d Fixes para's abilities to use other vehicles. 2019-06-02 19:11:34 +01:00
Fermi
59e5372abd Made it so prosthetics can't replace legs. Compiled and tested. 2019-06-02 18:40:56 +01:00
Fermi
a1e92ce654 Actually check legs. 2019-06-02 18:26:00 +01:00
Ghommie
472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 2019-06-02 19:03:34 +02:00
Ghommie
d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Poojawa
d4abb85641 Update preferences.dm 2019-06-02 09:40:18 -05:00
Poojawa
69b1373209 compile testing and tweaks 2019-06-02 08:06:16 -05:00
Poojawa
818ec19561 Working as intended, fixed a few other missing sprites
Started groundwork for multi-breasts and hidden balls.
2019-06-02 04:44:57 -05: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
Fermi
fd22dbfc0d More fixes. Need to check over merging math. 2019-06-02 03:59:52 +01:00
Fermi
0fa445c153 Fixes and test. 2019-06-02 03:24:01 +01:00
Sishen
9347ad57b1 sneaky erp 2019-06-01 20:20:55 -04:00
Sishen
9aaeed6f81 Update packs.dm 2019-06-01 19:46:09 -04:00
Fermi
3cf3268c76 New non-harmful medicinal darts. 2019-06-01 22:52:03 +01: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
4603019046 Quick fix to prevent parapalegics driving with no legs. 2019-06-01 18:24:17 +01:00
Fermi
bebaf8e7a8 Wheelchairs are apparently banned, we now have HOVERCHAIRS! 2019-06-01 18:17:49 +01:00
Fermi
7990a20ea6 We don't have wheelchairs? Heresy. Plus fixes to work on citcode. Csafe 2019-06-01 17:20:04 +01:00
Fermi
44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) 2019-06-01 16:52:58 +01:00
CalamaBanana
a37f84fb9b Ports RP Deer taur and adds Elf Ears to Mammals
Ports RP Deer taur and adds Elf Ears to Mammals
2019-06-01 17:28:17 +02:00