Commit Graph

13489 Commits

Author SHA1 Message Date
kevinz000
f76737dc04 Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
2019-06-28 05:18:35 -07:00
kevinz000
ee852382f8 Merge pull request #8726 from Sishen1542/biblethump
Tweaks to chaplain bible heals. Time to pull out the old brainbuster.
2019-06-28 05:14:57 -07:00
kevinz000
a103611d1b Merge pull request #8760 from Trilbyspaceclone/LoudnProud
Makes ling's adrendals have a loudness 2
2019-06-28 05:12:43 -07:00
deathride58
d979dfef59 Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
2019-06-28 00:53:23 -04:00
deathride58
8f168727c5 Merge pull request #8730 from Ghommie/Ghommie-cit80
Port in alt click to eject beaker and swapping beakers for chem machines, grinder radial menu.
2019-06-28 00:52:59 -04:00
deathride58
fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
2019-06-28 00:47:09 -04:00
deathride58
3cd5b1d180 Merge pull request #8741 from Ghommie/Ghommie-cit88
ports "Stockings"
2019-06-28 00:38:27 -04:00
deathride58
2ed69c8b46 Merge pull request #8753 from Sishen1542/siliconmanbad
[PORT] Non-station AI can no longer interact off their z-level.
2019-06-28 00:29:32 -04:00
deathride58
720d4ee4c8 Merge pull request #8745 from Sishen1542/CASfix
Port of tg pull #44158, the fix of Cards Against Space!
2019-06-28 00:25:32 -04:00
deathride58
db6e8ecd4c Merge pull request #8755 from Poojawa/the-balls-should-be-inert
Fixes errant ball behaviour
2019-06-28 00:23:37 -04:00
deathride58
1e3cc6d23e Merge pull request #8764 from Trilbyspaceclone/patch-189
Allows shoulder holster to hold cap gun and mini-eguns
2019-06-28 00:11:09 -04:00
deathride58
229c7c75f2 Merge pull request #8766 from Ghommie/Ghommie-cit92
Fixing "You can Alt click paper with TK to teleport it to you."
2019-06-28 00:08:27 -04:00
Trilbyspaceclone
227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
Ghommie
d7028b0059 Fixes "Bubbles ate my Cohiba Robusto!" 2019-06-27 05:32:08 +02:00
Ghommie
f118edad1d Fixing "You can Alt click paper with TK to teleport it to you." 2019-06-27 04:42:14 +02:00
Trilbyspaceclone
6ad0a0ba0d Update belt.dm 2019-06-26 20:14:05 -04:00
Trilbyspaceclone
6b173432b2 Update belt.dm 2019-06-26 20:09:37 -04:00
TrilbySpaceClone
9cab7b960c web-editless 2019-06-26 18:10:13 -04:00
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Sishen
65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00
Ghommie
61a6d899d2 Should be ready. 2019-06-26 00:21:06 +02: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
Sishen
935080e7a1 thatwasreallyannoying 2019-06-24 20:21:27 -04:00
Ghommie
31b5f2a458 ports "Stockings" 2019-06-24 07:30:13 +02: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
TrilbySpaceClone
74c607b2df Ghommie Asked 2019-06-23 17:15:03 -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
kevinz000
90564c714d Merge pull request #8710 from Arturlang/Nanite_Fixes
Fixes some nanite runtimes, and exploits
2019-06-23 06:08:36 -07:00
kevinz000
c48488f97f Merge pull request #8718 from Linzolle/ctrlsuit
allows quick maxing of suit sensors
2019-06-23 06:01:52 -07:00
kevinz000
b7ab8880d6 Ports in "makes the abductor console use radials" (#8732)
* Ports in "makes the abductor console use radials"

* indention bested me.
2019-06-23 06:01:28 -07:00
Ghom
d4a13077ff ports in "Adds radial menu to arm-mounted implants" (#8733) 2019-06-23 06:01:09 -07:00