Commit Graph

13931 Commits

Author SHA1 Message Date
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
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
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
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
2019-06-23 06:00:27 -07:00
Ghom
d21e483abf Ports "Disembowelment now only works if you are dead/in critical" (#8671) 2019-06-23 05:59:50 -07:00
Trilbyspaceclone
d85a2f5f4a Update arcade.dm (#8675) 2019-06-23 05:59:35 -07:00
Trilbyspaceclone
51e4ac0f67 fixes plant disk design and hacked autolathen (#8674)
* fixes plant disk design and hacked autolathen

* Update lavaland_surface_seed_vault.dmm
2019-06-23 05:59:19 -07:00
Sishen
bfa212f43e Update toxin_reagents.dm 2019-06-23 04:38:58 -04:00
Sishen
13363ab16f Update drink_reagents.dm 2019-06-23 04:36:54 -04:00
Sishen
b63453a7f0 Update drink_reagents.dm 2019-06-23 04:36:12 -04:00
Sishen
a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Ghommie
13c939ae41 porting pizza fixes. 2019-06-23 09:07:59 +02:00
Trilbyspaceclone
8418ce8a34 Merge branch 'Poojawa_How_Do_I_Update_My_Shit' into Just-in-case-pls 2019-06-23 02:54:02 -04:00
TrilbySpaseClone
0ea7ce3731 No... 2019-06-23 02:51:01 -04:00
Ghommie
b168a8c294 Fixes CWC construct shells being visible as ghost role to latejoiners. 2019-06-23 08:03:56 +02:00
Trilbyspaceclone
4278284e7b Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit 2019-06-23 01:52:59 -04:00
TrilbySpaseClone
7f4d60ae25 Poojawa this would been easyer with webedits 2019-06-23 01:49:45 -04:00
Ghommie
a2d896351b Sort of porting "Changes the type pathing of some "random" items" 2019-06-23 07:10:11 +02:00
Ghommie
d1008122da indention bested me. 2019-06-23 06:33:27 +02:00
Ghommie
41c0586154 Ports in "makes the abductor console use radials" 2019-06-23 06:28:37 +02:00
Ghommie
2e30b91567 Ports in microwave updates and its radial menu. 2019-06-23 06:10:49 +02:00
Ghommie
c01499b5a0 Ports in radials for reagent grinders, alt click to eject beaker and beaker swapping. 2019-06-23 04:32:39 +02:00
Ghommie
38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Sishen
410c960f79 Update chem_dispenser.dm 2019-06-22 18:35:04 -04:00