 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
|
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 |
|
|
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 |
|
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
8b27926fee
|
Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
|
2019-05-31 18:00:12 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
c645d2129f
|
Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
|
2019-05-31 17:52:25 -07:00 |
|
|
kevinz000andGitHub
|
4224606c5f
|
Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
|
2019-05-31 17:50:59 -07:00 |
|
|
kevinz000andGitHub
|
61f9c2edcd
|
Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
|
2019-05-31 17:47:08 -07:00 |
|
|
kevinz000andGitHub
|
14d763bd1d
|
Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
|
2019-05-31 17:46:44 -07:00 |
|
|
kevinz000andGitHub
|
8c6d8eb20b
|
Merge pull request #8471 from Sishen1542/buttslol
Butt slaps fix & Masochism! (fixed)
|
2019-05-31 17:45:07 -07:00 |
|
|
kevinz000andGitHub
|
854eb129f6
|
Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
|
2019-05-31 17:43:53 -07:00 |
|
|
kevinz000andGitHub
|
1efdfd38e0
|
Merge pull request #8436 from Trilbyspaceclone/patch-137
Allows bio genes to make synth meat
|
2019-05-31 17:43:22 -07:00 |
|
|
kevinz000andGitHub
|
f678741a0e
|
Merge pull request #8470 from Ghommie/Ghommie-cit19
Undunks pepper spray & teargas.
|
2019-05-31 17:42:28 -07:00 |
|
|
kevinz000andGitHub
|
ca16cd9467
|
Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS
[Ready] High alarm ERT suits
|
2019-05-31 17:41:39 -07:00 |
|
|
kevinz000andGitHub
|
a96e414d2f
|
Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
|
2019-05-31 17:40:30 -07:00 |
|
|
TrilbyspacecloneandGitHub
|
ddfe9812a1
|
Update shotgun.dm
|
2019-05-31 16:06:26 -04:00 |
|
|
BurgerLua
|
5dc3542f90
|
added
|
2019-05-30 15:49:53 -07:00 |
|
|
TrilbyspacecloneandGitHub
|
c73884aea4
|
huh...
|
2019-05-30 16:12:40 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
751b9adb53
|
Update recipes.dm
|
2019-05-30 16:10:10 -04:00 |
|
|
Ghommie
|
fa4cf533cb
|
honestly AP bullet spam is ballocks too.
|
2019-05-30 20:20:05 +02:00 |
|
|
kevinz000andGitHub
|
f5b3484e92
|
Merge pull request #8295 from Trilbyspaceclone/T_T
[Ready] Nerfs(Not really) Engi printing and organized many designs
|
2019-05-30 11:12:35 -07:00 |
|
|
Ghommie
|
85ab988842
|
0, null, and "", all fulfill the ! operator.
|
2019-05-30 20:09:19 +02:00 |
|
|
TrilbyspacecloneandGitHub
|
a8ec60d9c1
|
Update miscellaneous.dm
|
2019-05-30 13:51:55 -04:00 |
|
|
|
e75e629a8a
|
Update code/modules/antagonists/changeling/powers/adrenaline.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-05-30 10:32:02 -07:00 |
|
|
Coolgat3
|
674e8a4227
|
Glubbs
|
2019-05-30 18:59:43 +02:00 |
|