Ghommie
|
61a6d899d2
|
Should be ready.
|
2019-06-26 00:21:06 +02:00 |
|
Fermi
|
3928e027b4
|
Fixes (see dev discussion)
|
2019-06-25 23:06:55 +01:00 |
|
Arturlang
|
c0c7597c76
|
Fixes trauma healing nanites.
|
2019-06-25 12:39:30 +03:00 |
|
kevinz000
|
0c20dc6e72
|
Merge pull request #8706 from Sishen1542/thecargonianengineeralliance
Ports the ability to sell fusion gases & generate research points with fusion. Also adds atmos hardsuits purchasable through cargo.
|
2019-06-25 02:00:41 -07:00 |
|
kevinz000
|
45842ebda7
|
Update lungs.dm
|
2019-06-25 01:38:26 -07:00 |
|
kevinz000
|
67312abf04
|
Update life.dm
|
2019-06-25 01:37:51 -07:00 |
|
kevinz000
|
b45a789b54
|
Update life.dm
|
2019-06-25 01:35:56 -07:00 |
|
kevinz000
|
626ec64c1c
|
Update lungs.dm
|
2019-06-25 01:34:19 -07:00 |
|
Fermi
|
4145b0f256
|
Hotfix for egregious oversights.
|
2019-06-25 07:22:20 +01:00 |
|
Sishen
|
935080e7a1
|
thatwasreallyannoying
|
2019-06-24 20:21:27 -04:00 |
|
Ghommie
|
67f00fc049
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
|
2019-06-24 16:48:15 +02:00 |
|
Fermi
|
8605d3a246
|
Found a pH overflow.
|
2019-06-24 15:06:18 +01:00 |
|
Ghommie
|
31b5f2a458
|
ports "Stockings"
|
2019-06-24 07:30:13 +02:00 |
|
Ghommie
|
9f0278c34f
|
map merging.
|
2019-06-24 06:13:42 +02:00 |
|
Ghommie
|
fd68236594
|
ports "More variety for dorms bedsheets" + 3 new bed sheets.
|
2019-06-24 05:54:14 +02:00 |
|
Trilbyspaceclone
|
53c61b9050
|
Merge branch 'master' into Rnd_brakeup
|
2019-06-23 21:09:53 -04:00 |
|
Ghommie
|
71298c084d
|
didn't init the list, bravo.
|
2019-06-24 03:09:43 +02:00 |
|
Trilbyspaceclone
|
e9f36b79bb
|
Merge branch 'master' into meme_tools
|
2019-06-23 21:07:55 -04:00 |
|
Trilbyspaceclone
|
063fe4fdef
|
Merge branch 'master' into Unmodular
|
2019-06-23 21:06:21 -04:00 |
|
Trilbyspaceclone
|
5297608bfd
|
Update uplink_items.dm
|
2019-06-23 20:59:18 -04:00 |
|
Trilbyspaceclone
|
368a623cf8
|
Update uplink_items.dm
|
2019-06-23 20:58:13 -04:00 |
|
Trilbyspaceclone
|
ede0bbe89e
|
Merge branch 'master' into patch-185
|
2019-06-23 20:56:25 -04:00 |
|
kevinz000
|
69d48c5e5e
|
Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit
Removes Nudity Permits and replaces them with invisible gear harnesses
|
2019-06-23 17:26:30 -07:00 |
|
Ghommie
|
e0b9706453
|
Alphabetic order.
|
2019-06-24 00:38:34 +02:00 |
|
TrilbySpaceClone
|
74c607b2df
|
Ghommie Asked
|
2019-06-23 17:15:03 -04:00 |
|
Sishen
|
a74712eef2
|
Update toxins.dm
|
2019-06-23 15:33:16 -04:00 |
|
Fermi
|
fdba8c000f
|
Fixing compiling errors.
|
2019-06-23 20:03:37 +01:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
Fermi
|
b309490190
|
Forgot to ctrl+s
|
2019-06-23 19:02:53 +01:00 |
|
Fermi
|
8992dbfa4d
|
Commented out hypnoquirk and edited it so that it functions differently
|
2019-06-23 18:59:15 +01:00 |
|
TrilbySpaceClone
|
05416b8f53
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into patch-176
|
2019-06-23 13:00:17 -04:00 |
|
kevinz000
|
f7dcedce5f
|
Merge pull request #8715 from Sishen1542/toxinmanbad
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
|
2019-06-23 06:57:09 -07:00 |
|
kevinz000
|
05f304f9c0
|
Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
|
2019-06-23 06:56:17 -07:00 |
|
kevinz000
|
c9d67ecd49
|
Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
|
2019-06-23 06:54:43 -07:00 |
|
kevinz000
|
2b50f355d7
|
Merge pull request #8666 from Ghommie/Ghommie-cit60
Fixes roffle waffle, mushroom hallucinogen and some invalid reagents.
|
2019-06-23 06:54:05 -07:00 |
|
kevinz000
|
dcab96d9d5
|
Merge pull request #8721 from Ghommie/Ghommie-cit77
Ports in "Liver removal/failure now also stops passive reagent effects"
|
2019-06-23 06:53:30 -07:00 |
|
kevinz000
|
b33aa0f049
|
Merge pull request #8695 from Ghommie/Ghommie-cit71
Porting smartfridge improvements.
|
2019-06-23 06:53:02 -07:00 |
|
kevinz000
|
d30560f7d7
|
Merge pull request #8722 from Trilbyspaceclone/patch-186
Makes tower shield be see able
|
2019-06-23 06:52:25 -07:00 |
|
kevinz000
|
294e1e48d2
|
Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
|
2019-06-23 06:50:32 -07:00 |
|
kevinz000
|
94d92f7b1b
|
Merge pull request #8664 from BlackMajor/MeMapGood
Adds another space ruin
|
2019-06-23 06:49:37 -07:00 |
|
kevinz000
|
fc9a5415d8
|
Merge pull request #8678 from Sishen1542/SECMANBAD
Fixes Plush Doll Loot [FOR REAL THIS TIME]
|
2019-06-23 06:48:53 -07:00 |
|
kevinz000
|
b47b3723a1
|
Merge pull request #8687 from Ghommie/Ghommie-cit66
Ports "Fixes advanced proc calls not working + various code cleaning"
|
2019-06-23 06:46:48 -07:00 |
|
kevinz000
|
46140e16ec
|
Merge pull request #8689 from Thalpy/Pandas
Add Red Panda simplemobs.
|
2019-06-23 06:46:32 -07:00 |
|
kevinz000
|
082d6c75a9
|
Merge pull request #8688 from Ghommie/Ghommie-cit67
Ports in bee plushes.
|
2019-06-23 06:45:49 -07:00 |
|
kevinz000
|
9db94f7c29
|
Merge pull request #8691 from Ghommie/Ghommie-cit68
Ports in beekini and bee socks.
|
2019-06-23 06:41:34 -07:00 |
|
kevinz000
|
228df53c99
|
Merge pull request #8698 from Ghommie/Ghommie-cit72
Fixes "Penlights Cannot Give Eye Exams"
|
2019-06-23 06:41:03 -07:00 |
|
BlackMajor
|
d6a31efaa2
|
Merge pull request #8684 from Citadel-Station-13/kevinz000-patch-5
fixes piggybacking being delayless
|
2019-06-24 01:31:40 +12:00 |
|
kevinz000
|
e7331b3c98
|
Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
|
2019-06-23 06:24:10 -07:00 |
|
kevinz000
|
6f2fbd8577
|
Merge pull request #8677 from Trilbyspaceclone/patch-182
buffs speedy step quirk by a half
|
2019-06-23 06:20:58 -07:00 |
|
kevinz000
|
fc5eb0c9d5
|
Merge pull request #8665 from Ghommie/Ghommie-cit59
Buffs out certain stun spells.
|
2019-06-23 06:19:41 -07:00 |
|