Commit Graph

9240 Commits

Author SHA1 Message Date
Chayse Ramsay
f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay
5e757f1012 Update code/modules/mob/living/carbon/life.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-08-04 05:26:16 +01:00
Chayse Ramsay
0a7054c604 Update code/modules/mob/living/carbon/inventory.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-08-04 05:26:02 +01:00
Chayse Ramsay
46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
kevinz000
1c1ca84c3a Update miscellaneous.dm 2019-08-03 00:49:57 -07:00
kevinz000
f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
TrilbySpaceClone
3a85f9473c amazing 2019-08-02 14:37:52 -04:00
EgoSumStultus
4de05fc692 AAAAAAAAAAAAHHHHHHHHHHH 2019-08-02 06:48:14 -07:00
kevinz000
d5b0104a3e Update miscellaneous.dm 2019-08-02 05:46:49 -07:00
kevinz000
eca34a6552 Merge pull request #8994 from Ghommie/Ghommie-cit164
Makes staminaloss also apply the oxyloss fullscreen overlay.
2019-08-02 01:43:46 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
kevinz000
eef733da3d Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator
Alert Level is now displayed at the job selection screen.
2019-08-02 00:55:18 -07:00
kevinz000
caa0579fca Merge pull request #9016 from Trilbyspaceclone/patch-204
Fixes Pound and hardware cake
2019-08-01 23:29:27 -07:00
kevinz000
b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun
Makes a new traitor Emitter gun for Engi memes
2019-08-01 23:29:10 -07:00
kevinz000
84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting
Hallucination Sting Buffs
2019-08-01 23:26:37 -07:00
kevinz000
0a83649f28 Merge pull request #9000 from EgoSumStultus/shielf
REMOVES SHIELF
2019-08-01 23:25:52 -07:00
Linzolle
bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Poojawa
b5fcaf20e6 Fixes a runtime with a simple mob verb 2019-08-01 17:40:43 -05:00
Fermi
18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
BurgerLua
c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua
3baac83021 Added 2019-07-31 16:40:35 -07:00
Ghommie
a9b16701a1 Ports "Lizardwine drink crafting fix" 2019-08-01 00:31:14 +02:00
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
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
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
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
BurgerLua
1db0ceff1f Added 2019-07-31 03:33:33 -07:00
BurgerLua
89f2ed4064 Added 2019-07-31 02:55:48 -07: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
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
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
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
26c195dec8 Merge pull request #8971 from Linzolle/toxiclover
makes slimepeople like toxic food
2019-07-29 04:39:12 -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
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