Commit Graph

14703 Commits

Author SHA1 Message Date
Ghommie
438c3253d0 Taur snowflake code makes me sick. 2019-07-31 22:01:05 +02:00
Ghommie
7c9c51b777 Ports "Adds techpriest robes and adds them to the RoboDrobe" 2019-07-31 21:54:55 +02:00
Ghommie
6dd92ce122 . 2019-07-31 21:26:59 +02:00
Ghommie
d9a09d7211 Undoes a few things. 2019-07-31 21:23:20 +02:00
Ghommie
1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. 2019-07-31 21:02:12 +02:00
Trilbyspaceclone
937c809b0b Update action.dm 2019-07-31 12:57:10 -04:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Trilbyspaceclone
c68fb90955 Update snacks_cake.dm 2019-07-31 12:03:56 -04:00
Trilbyspaceclone
ef6be90435 Update recipes_frozen.dm 2019-07-31 11:42:20 -04:00
Trilbyspaceclone
3dca4dd379 Update snacks_frozen.dm 2019-07-31 11:35:19 -04:00
kevinz000
d6885d41a9 Update quirks.dm 2019-07-31 07:54:14 -07:00
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
Trilbyspaceclone
bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
BurgerLua
1db0ceff1f Added 2019-07-31 03:33:33 -07:00
BurgerLua
89f2ed4064 Added 2019-07-31 02:55:48 -07:00
Linzolle
db198ba217 fix leg sweep 2019-07-31 01:17:12 -05:00
Ghommie
16afae1e14 boolean 2019-07-31 03:06:20 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Chayse Ramsay
085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
Fermi
fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Michiyamenotehifunana
94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
Trilbyspaceclone
57b6294310 Update uplink_items.dm 2019-07-29 07:54:17 -04:00
Trilbyspaceclone
969b928642 Update special.dm 2019-07-29 07:53:41 -04:00
Trilbyspaceclone
f9dfe5ae97 Update special.dm 2019-07-29 07:53:11 -04:00
kevinz000
e6fc288076 Merge pull request #8950 from Trilbyspaceclone/patch-195
Ports "Fixes slime lungs runtime. #45057"
2019-07-29 04:50:49 -07:00
kevinz000
e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix
Mobs eaten by His Grace now require a mind attached to count for ascension
2019-07-29 04:47:44 -07:00
kevinz000
0cda6cf8cf Merge pull request #8991 from Trilbyspaceclone/patch-200
Ports "Fixes bloodchiller and ling tentacle. #45337" - Item storge fix
2019-07-29 04:47:01 -07:00
kevinz000
25eba5829d Merge pull request #8980 from Ghommie/Ghommie-cit159
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
2019-07-29 04:44:08 -07:00
kevinz000
2252b81798 Merge pull request #8964 from Trilbyspaceclone/patch-197
Makes steal a few steal objectives better worded and role restricted better
2019-07-29 04:42:20 -07:00
kevinz000
a0cf508d99 Merge pull request #8959 from Trilbyspaceclone/patch-196
Ports "Anti-magic items now work properly in the suit storage slot #45333"
2019-07-29 04:41:55 -07:00
kevinz000
3713533c18 Merge pull request #8983 from Ghommie/Ghommie-cit161
One liner fix for the most useless feature of the year.
2019-07-29 04:41:23 -07:00
kevinz000
a95fff589c Merge pull request #8966 from Poojawa/RLD-fix
Gives RLD adaptive overlays, adds cable color to RCL sprites
2019-07-29 04:41:07 -07:00
kevinz000
624d74f500 Merge pull request #8965 from Trilbyspaceclone/patch-198
Ports "Security can access gulag equipment reclaimer #45298"
2019-07-29 04:40:01 -07:00
kevinz000
26c195dec8 Merge pull request #8971 from Linzolle/toxiclover
makes slimepeople like toxic food
2019-07-29 04:39:12 -07:00
kevinz000
8477a524ae Merge pull request #8978 from YakumoChen/cardbored
Removes stealth implant box integrity
2019-07-29 04:38:42 -07:00
kevinz000
11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-29 04:38:14 -07:00
kevinz000
2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-29 04:37:36 -07:00
kevinz000
156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162
allows the captain sabre sheat to hold stunswords.
2019-07-29 04:37:21 -07:00
kevinz000
32e8bfbea1 Merge pull request #8979 from Ghommie/Ghommie-cit158
Fixes CHECK_BITFIELD macro.
2019-07-29 04:33:21 -07:00
kevinz000
7b7f4f8042 Merge pull request #8795 from Sishen1542/emp-rebalance
Buffs tracking beacon EMPs, and makes EMP damage temporarily disable mech equipment
2019-07-29 04:32:51 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
EgoSumStultus
1263918bd3 REMOVE SHIELF 2019-07-28 21:51:40 -07:00
BurgerLua
cdb45a2ae0 Added 2019-07-28 21:37:49 -07:00
Ghommie
2eda8f2666 Fixes "inactive" high luminosity eyes turning back on as soon as you move around. 2019-07-29 06:13:36 +02:00
Ghommie
db3b714489 . 2019-07-29 04:52:53 +02:00
Ghommie
4ef1413342 dupe icons instead of snowflake vars. 2019-07-29 04:50:12 +02:00
Ghommie
2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Fermi
31709938c6 Pushing a buncha stuff so I can fix things. 2019-07-28 23:23:45 +01:00