Commit Graph
13184 Commits
Author SHA1 Message Date
kevinz000andGitHub cc2d3a7f10 Merge pull request #8516 from Ghommie/Ghommie-cit26
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
2019-06-05 01:53:34 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 98491cd2f8 Merge pull request #8504 from Trilbyspaceclone/patch-160
buffs resonator
2019-06-05 01:49:11 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 52b189dc98 Merge pull request #8502 from Sishen1542/meatyors
Meteor Sats not exclusive to station goal
2019-06-05 01:40:50 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
TrilbyspacecloneandGitHub da67bdf63d >_> 2019-06-04 12:40:29 -04:00
TrilbyspacecloneandGitHub 7fb1f7fba1 Update snacks_pastry.dm 2019-06-03 18:38:55 -04:00
deathride58andGitHub b95b14d033 Merge pull request #8515 from Ghommie/Ghommie-cit25
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
2019-06-03 17:51:13 -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
kevinz000andGitHub fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
2019-06-03 00:51:36 -07:00
BurgerLua c98d2ce5a0 nuke be gone 2019-06-02 15:21:45 -07:00
Ghommie 6be3496d36 Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:50:02 +02: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
ThalpyandGitHub e0690c610a Added a check to ensure empath target isn't dead. 2019-06-02 20:53:41 +01:00
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
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 73e279dada excessive parenthesis wrapping. 2019-06-02 18:29:43 +02:00
Ghommie d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
PoojawaandGitHub 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
Ghommie e6e06a1a43 Makes clockwork wall - sonic jackhammer interaction account the wall's superheating. 2019-06-02 13:59:36 +02:00
Ghommie ae5d68c6f9 Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency. 2019-06-02 13:24:03 +02: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
BurgerLua e7802a9b03 Arcade Loot Improvements 2019-06-02 02:02:47 -07: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
Sishen 9aaeed6f81 Update packs.dm 2019-06-01 19:46:09 -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
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
TrilbyspacecloneandGitHub d6486e2f6c Update resonator.dm 2019-05-31 23:13:31 -04:00
TrilbyspacecloneandGitHub 78822d2e42 Update resonator.dm 2019-05-31 23:06:08 -04:00
TrilbyspacecloneandGitHub ed95ba20b6 so we dont speed removal plants by missclicks 2019-05-31 23:03:00 -04:00
TrilbyspacecloneandGitHub 2d91388be8 Update mining_tools.dm 2019-05-31 22:57:28 -04:00
kevinz000andGitHub 70bad08f95 Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
2019-05-31 19:23:03 -07:00
UserothandGitHub a46312ede6 Update godhand.dm 2019-06-01 04:20:27 +02:00
kevinz000andGitHub e63f9f385b Merge pull request #8359 from Useroth/pneumatic-and-stun-buff
[MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.
2019-05-31 19:18:53 -07:00
UserothandGitHub 8af39b8da7 Update godhand.dm 2019-06-01 04:16:37 +02:00
Sishen 5dde4555cc lmao2crate 2019-05-31 21:11:39 -04:00