Putnam
ac432bdd25
remember to compile before sending commits
2021-03-24 18:31:06 -07:00
silicons
32797e0446
Merge pull request #14480 from BlueWildrose/sensorydetail
...
Adds suit sensor damage, clothing damage changes
2021-03-24 19:25:24 -06:00
Putnam
7190ef5d62
why did i do it that way?
2021-03-24 18:25:12 -07:00
silicons
0845840f5e
Merge pull request #14507 from CuteMoff/thisismydiamondsword
...
Added "Diamond Ingots" for Blacksmithing
2021-03-24 19:23:02 -06:00
silicons
602140af99
Merge pull request #14497 from Hatterhat/lever-guns
...
.38 lever-action rifles but not actually implemented
2021-03-24 19:22:36 -06:00
Putnam
ebb233ab36
More supernova adjustments
2021-03-24 18:21:26 -07:00
Putnam
18ce504f06
oh and this should not go up infinitely
2021-03-24 17:24:13 -07:00
Putnam
254187bc2e
it's not a global proc
2021-03-24 17:23:21 -07:00
necromanceranne
45340ef1ac
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
2021-03-25 09:27:33 +11:00
necromanceranne
79de55c58c
First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately.
2021-03-25 09:07:52 +11:00
R3dtail
32be7ecabd
Adjusts blackmarket uplink
...
Removes bone spears from the uplink, and makes EMP grenades rarer and more expensive
2021-03-24 16:53:41 -05:00
dzahlus
83102b056b
Update miscellaneous.dm
2021-03-24 19:14:52 +01:00
LetterN
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
DeltaFire
086bb75006
Merge pull request #14483 from zeroisthebiggay/patch-6
...
makes strained muscles slightly less absurd by adding a proper chemical slowdown
2021-03-24 06:47:45 +01:00
CuteMoff
9d8c7dff35
Update code/modules/smithing/smithed_items.dm
...
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2021-03-23 23:15:03 -04:00
CuteMoff
99caab1ec8
Update smithed_items.dm
2021-03-23 21:08:11 -04:00
zeroisthebiggay
513b98f3e0
Update strained_muscles.dm
2021-03-23 20:28:46 -04:00
Hatterhat
30a9ad5059
yeehaw :)
2021-03-23 18:55:00 -05:00
Lin
ebf652f736
Merge pull request #14472 from silicons/sigh_615
...
makes the global antag disable pref more clear. forces savefile update to default all players to having the **disable** *disabled* (i love double negatives).
2021-03-23 17:53:50 -05:00
Timothy Teakettle
14ba2b3da1
OOPS
2021-03-23 22:40:27 +00:00
DeltaFire
20cd8568e8
Merge pull request #14498 from Hatterhat/patch-2
...
medsuture/medmesh recipe buff
2021-03-23 23:15:26 +01:00
Timothy Teakettle
fa541671d6
yes
2021-03-23 21:44:19 +00:00
DeltaFire
afd8af60e3
Merge pull request #14430 from YakumoChen/genetics
...
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
2021-03-23 22:35:54 +01:00
Lin
79beaa97eb
Merge pull request #14481 from BlueWildrose/ewwghostpuddles
...
Nightmares' light eater can now destroy messes that emit light
2021-03-23 16:33:59 -05:00
Lin
b7f8deaf38
Merge pull request #14484 from zeroisthebiggay/cumbranch
...
biodegrade works on legcuffs
2021-03-23 16:22:26 -05:00
zerothebigboy
f600e51408
i hate kitsune players so i hope you appreciate me adding more cringe to your arsenal
2021-03-23 15:50:13 -04:00
qweq12yt
e70b03f770
fixes/balaces derringer/wind-up gun
2021-03-23 16:31:03 -03:00
qweq12yt
3b5ebd1149
windup fixes, derringer balancing?
2021-03-23 16:31:03 -03:00
qweq12yt
a16f5d04b7
partial derringer - windup needs balance
2021-03-23 16:31:02 -03:00
Fabian
eb0973969d
Merge branch 'master' into joy
2021-03-23 20:28:09 +01:00
Fabian
989ed923d8
accidental powergame armor removal
2021-03-23 20:02:07 +01:00
silicons
5910950a49
Merge pull request #14473 from ItzGabby/bark-box
...
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
silicons
bfb122d706
Merge pull request #14475 from qweq12yt/black-market-fixes
...
Black Market: The return
2021-03-22 21:14:57 -06:00
Hatterhat
d9977e24b5
Update medicine.dm
2021-03-22 21:29:48 -05:00
Hatterhat
6bac90f8de
uhh initial commit ig
2021-03-22 21:23:00 -05:00
Hatterhat
e5c01bc0f8
limbgrower limbs can be used in augmentations
2021-03-22 20:15:01 -05:00
Lin
dd764ceb0e
Merge pull request #14491 from Hatterhat/triggerfix
...
noguns now takes precedence over trigger guard
2021-03-22 19:55:12 -05:00
Lin
715f86ef5c
Merge pull request #14447 from LetterN/fixes-2
...
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
Lin
4e641eedb9
Merge pull request #14489 from LetterN/amogus
...
Fixes NIRM
2021-03-22 15:37:56 -05:00
LetterN
760a7de229
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-22 09:32:21 +08:00
Hatterhat
722b50088a
message tweak
...
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com >
2021-03-21 19:26:34 -05:00
Hatterhat
a8e4466476
sigh
2021-03-21 18:16:22 -05:00
LetterN
86b8bbf727
no more free shipping
2021-03-21 21:44:04 +08:00
LetterN
8d9c4f55d6
no dumb names
2021-03-21 13:51:08 +08:00
LetterN
ce3c4e99ea
fix-but-its-in-the-wrong-branch
2021-03-21 13:46:18 +08:00
zeroisthebiggay
b292fcb1dd
Update strained_muscles.dm
2021-03-20 19:52:39 -04:00
zeroisthebiggay
f4b3d7274c
Update strained_muscles.dm
2021-03-20 19:50:13 -04:00
zeroisthebiggay
bc3a2e19b2
Update strained_muscles.dm
2021-03-20 19:44:41 -04:00
zeroisthebiggay
531409e472
Update strained_muscles.dm
2021-03-20 19:39:57 -04:00
zerothebigboy
969f64af1a
f u c k
2021-03-20 19:23:55 -04:00
