Commit Graph

14703 Commits

Author SHA1 Message Date
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
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
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
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
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
7fe18b5a37 Parapalegic trait. 2019-06-01 16:55:31 +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
BurgerLua
d67b179bff RCD Memes 2019-05-31 20:32:17 -07:00
Fermi
40aa231b64 Made MKUltra's OD on self turn the player into a narcissist. 2019-06-01 04:31:34 +01:00
Trilbyspaceclone
d6486e2f6c Update resonator.dm 2019-05-31 23:13:31 -04:00
Trilbyspaceclone
78822d2e42 Update resonator.dm 2019-05-31 23:06:08 -04:00
Trilbyspaceclone
ed95ba20b6 so we dont speed removal plants by missclicks 2019-05-31 23:03:00 -04:00
Trilbyspaceclone
2d91388be8 Update mining_tools.dm 2019-05-31 22:57:28 -04:00
Thalpy
d9058fa53d Merge pull request #13 from Citadel-Station-13/master
OH BOY HERE WE GO AGAIN
2019-06-01 03:23:48 +01:00
kevinz000
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
Useroth
a46312ede6 Update godhand.dm 2019-06-01 04:20:27 +02:00
kevinz000
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
Useroth
8af39b8da7 Update godhand.dm 2019-06-01 04:16:37 +02:00
Fermi
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
Sishen
5dde4555cc lmao2crate 2019-05-31 21:11:39 -04: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
kevinz000
8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
2019-05-31 18:00:12 -07:00
kevinz000
2a5bbfdafc Merge pull request #8482 from Ghommie/Ghommie-cit22
fixes pacifism eyestabbing, better this time.
2019-05-31 17:59:33 -07:00
kevinz000
140e065525 Merge pull request #8495 from BurgerLUA/Anti-Obese
Obesity is now a warning instead of a notice.
2019-05-31 17:59:09 -07:00
kevinz000
59e88e0808 Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
2019-05-31 17:58:48 -07:00
kevinz000
16c89da587 Merge pull request #8485 from Trilbyspaceclone/plushies
More plushies - Reece Trilby Bhijn Box Justin
2019-05-31 17:55:37 -07:00
kevinz000
7507831ffa Merge pull request #8449 from Trilbyspaceclone/patch-144
Makes PDA bomb cart cost 5 not 6
2019-05-31 17:52:40 -07:00
kevinz000
c645d2129f Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
2019-05-31 17:52:25 -07:00
kevinz000
4224606c5f Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
2019-05-31 17:50:59 -07:00
kevinz000
61f9c2edcd Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
2019-05-31 17:47:08 -07:00