Ghommie
56d31b0c8c
neuter/plural gender fixes.
2020-01-23 22:50:30 +01:00
ShadeAware
7035705f8b
and again
2020-01-23 16:40:54 -05:00
ShadeAware
f547c8692b
Changes all references of "Makeshift" to "Crafted" because im not willing to change the switchblade's fucking SEXY SPRITE
...
YOU CAN'T MAKE ME DO IT GHOMMIE, THAT IS SOMETHING I WILL NOT COMPROMISE ON.
2020-01-23 16:40:30 -05:00
Ghom
93310b8d4f
can_random_spawn = FALSE for icon-less plushes
2020-01-23 19:42:21 +01:00
Trilbyspaceclone
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
Ghom
14a33ee7dc
Merge pull request #10651 from r4d6/Soft-rad-suit
...
Make the radiation hardsuit a voidsuit instead
2020-01-23 19:23:09 +01:00
Ghommie
292aaa58dc
Fixes dead malf AI doomsday, a few ported updates.
2020-01-23 17:36:23 +01:00
Kraseo
14b7711590
i will end whoever ported virgo hairs and thought it was fine to do it like that
2020-01-23 17:29:21 +01:00
Ghom
21867f60dd
Merge pull request #10598 from Putnam3145/metabolic-synth-tweak
...
Made metabolic synthesis nanites stop if not fed
2020-01-23 16:38:39 +01:00
Ghom
51812ae0ec
Proud? No.
2020-01-23 16:33:11 +01:00
Ghom
86a3a5dd4d
Merge pull request #10610 from Owai-Seek/bountytweaks
...
Some Bounty Tweaks
2020-01-23 15:44:00 +01:00
Ghom
f3b9b20e57
Merge pull request #10672 from BlackMajor/master
...
Fixes a donor sprite.
2020-01-23 15:30:29 +01:00
Unknown
bd8ce9a7b6
Culturally Appropriate Lunar Clothes
2020-01-23 06:35:50 -07:00
ShadeAware
fd04469ff0
H
2020-01-23 08:01:28 -05:00
BlackMajor
77e7dff11b
Webedit PR man bad
2020-01-24 01:41:40 +13:00
Winter Flare
3d85499919
Requested Changes + Nerf
...
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
2020-01-23 07:20:22 -05:00
BlackMajor
5fb2e60ebf
Merge branch 'master' into master
2020-01-24 00:50:46 +13:00
kevinz000
83591f8883
Merge pull request #10620 from Hatterhat/patch-1
...
exo suit nerf - melee and bomb armor
2020-01-23 04:48:06 -07:00
kevinz000
4304a7dd42
Merge pull request #10602 from Ghommie/Ghommie-cit509
...
RPD ventcrawler escapism sanity check.
2020-01-23 04:47:46 -07:00
kevinz000
aa19c2a17b
Merge pull request #10603 from Ghommie/Ghommie-cit510
...
clockwork cuirass now compatible with snakes. The original author was too lazy.
2020-01-23 04:47:18 -07:00
kevinz000
1b7265d8c1
Merge pull request #10605 from r4d6/Layer
...
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
BlackMajor
7733d3f98a
Update robot_modules.dm
2020-01-24 00:42:41 +13:00
kevinz000
88f625edfc
Merge pull request #10636 from Ghommie/Ghommie-cit512
...
Trilby's solar panels PR but improved.
2020-01-23 04:35:13 -07:00
kevinz000
a01d7260d8
Merge pull request #10641 from jakeramsay007/Calibers-101
...
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
2020-01-23 04:34:24 -07:00
Artur
0091da8307
Linter fixes
2020-01-23 11:31:41 +02:00
Artur
19fcd89282
Shit
2020-01-23 11:31:41 +02:00
Seris02
4454eba40b
fixed
2020-01-23 16:12:12 +08:00
Seris02
5499638c5e
yes
2020-01-23 15:41:49 +08:00
Seris02
934c8fe533
updates + thingamajig
2020-01-23 15:25:45 +08:00
TrilbySpaceClone
86ea13afeb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270
2020-01-22 23:00:54 -05:00
Ghom
bf62563507
Merge pull request #10410 from CameronWoof/free-the-lizard
...
Humans and anthromorphs can now use lizard tails.
2020-01-23 03:06:52 +01:00
Ghom
047059617c
Merge pull request #10645 from r4d6/Modular-Lavaland
...
Modularize the mining base
2020-01-23 02:53:34 +01:00
Ghom
3ce27d6c36
Merge pull request #10638 from Hatterhat/patch-3
...
compact defibs have a properly set departmental flag now
2020-01-23 02:51:17 +01:00
Ghom
04811c9c22
Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8
...
(is this really a good idea) hitscan emitters
2020-01-23 02:44:17 +01:00
Ghom
fcbc5149c4
Merge pull request #10606 from r4d6/patch-2
...
Update the Passive Vents that I added
2020-01-23 02:40:54 +01:00
Ghommie
b0da18e404
Fixes chainsaw force being set to 0 on unwield.
2020-01-23 02:13:55 +01:00
kevinz000
70c9a9a25f
logic
2020-01-22 16:36:44 -07:00
kevinz000
cd0fc537b6
lgoic
2020-01-22 16:03:56 -07:00
ShadeAware
0b1a0e7286
Update weaponry.dm
2020-01-22 17:54:27 -05:00
ShadeAware
1c4f37b5bf
MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG
...
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
2020-01-22 17:50:57 -05:00
kappa-sama
c8cfd4e150
cursed
2020-01-22 16:52:28 -05:00
Artur
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
r4d6
c78944c5bc
Update
2020-01-22 13:47:57 -05:00
r4d6
869e31b27b
Removing useless code
2020-01-22 13:17:47 -05:00
r4d6
96c0a86b5f
Make the Radiation Hardsuit a Voidsuit instead
2020-01-22 13:17:29 -05:00
Arturlang
0a545da35d
Webedit galore
2020-01-22 18:12:26 +01:00
Arturlang
e025c8a743
Oh right its a typo
2020-01-22 18:11:37 +01:00
Trilbyspaceclone
ebb6ac1d7b
more words
2020-01-22 11:33:39 -05:00
kevinz000
c4475b1dda
variables
2020-01-22 05:39:16 -07:00
kevinz000
a28ebcc041
variables
2020-01-22 05:38:53 -07:00
