Lin
3f50e836cc
Merge pull request #15238 from DeltaFire15/nanitedefibs
...
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
2021-10-05 16:25:59 -07:00
Lin
8f9a2b6d0c
Merge pull request #15235 from silicons/pai_radio_Stuff
...
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
Lin
88db62f03f
Merge pull request #15239 from jakeramsay007/7.12x82mm-Fix
...
7.12x82mm Match Ammo box sprite fixed
2021-10-05 12:21:10 -07:00
Lin
b18fbe695a
Merge pull request #15233 from SandPoot/misc-fixes
...
Some random fixes
2021-10-05 10:27:19 -07:00
Chayse Ramsay
4d2e81d73c
newline
2021-10-05 02:52:50 +01:00
Chayse Ramsay
6f0722ab48
Ammo box sprite fixed
2021-10-04 18:36:17 +01:00
DeltaFire
97eb42b35b
defib policy hook & oxyheal
2021-10-04 15:49:12 +02:00
silicons
bac7bc3fb6
fix
2021-10-03 11:29:32 -07:00
silicons
f024318810
Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
...
Tribal Crafting Overhauled & Expanded
2021-10-03 11:20:55 -07:00
silicons
31467420d7
Merge pull request #15221 from SandPoot/colormate
...
Colormate tgui + minor tgui updates
2021-10-03 08:51:51 -07:00
SandPoot
95b814d47e
Upload files
2021-10-02 22:29:01 -03:00
WanderingFox95
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
Putnam3145
826ccbe40c
Merge pull request #15214 from qweq12yt/grab-bag-bug-fixing
...
[Fix] Grab bag bug fixing
2021-09-29 18:56:17 -07:00
SandPoot
b23b88524d
Upload files
2021-09-28 22:03:17 -03:00
silicons
770942e35d
Merge pull request #15199 from zeroisthebiggay/patch-26
...
removes motivation player lock; halves the motivation's price; allows motivation to discount.
2021-09-28 00:17:23 -07:00
silicons
5ff4a2ace5
Merge pull request #15180 from LetterN/achives-
...
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons
cd579124cb
Merge pull request #15188 from buffyuwu/clothingupdate1
...
ports/adds more edited clothing
2021-09-28 00:15:23 -07:00
silicons
f317e510f7
Merge pull request #15191 from keronshb/ninjaadjustment
...
Puts the ninja status back into the status window and restores the energy charge meter.
2021-09-28 00:14:42 -07:00
silicons
d6e7a096e6
Merge pull request #15206 from zeroisthebiggay/metaprison
...
meta station prison remapping
2021-09-28 00:13:13 -07:00
silicons
b7476491d3
Merge pull request #15204 from Hatterhat/clip-delay
...
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
2021-09-28 00:13:02 -07:00
silicons
dd6e2d7240
Merge pull request #15202 from Hatterhat/saiga-ballin
...
CCS stock safety
2021-09-28 00:12:54 -07:00
silicons
cefef5b0bc
Merge pull request #15203 from zeroisthebiggay/buggers
...
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
2021-09-27 23:31:03 -07:00
qweq12yt
4e8b02dd75
restored the serving tray to the autholathes
2021-09-27 17:38:28 -03:00
qweq12yt
0bb9b23537
restore spray bottle sounds
2021-09-27 17:32:07 -03:00
qweq12yt
91a738fb9e
fix canisters
2021-09-27 17:17:16 -03:00
WanderingFox95
4e87044845
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-27 18:15:34 +02:00
Hatterhat
d3704b845c
Merge branch 'master' into saiga-ballin
2021-09-26 21:41:00 -05:00
silicons
ec3fbed5bb
Merge pull request #15205 from zeroisthebiggay/patch-28
...
fixes code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
2021-09-26 13:30:40 -07:00
silicons
6c00bb8dce
Update living_blocking_parrying.dm ( #15208 )
2021-09-26 15:41:09 +02:00
zeroisthebiggay
be82bd310e
Update plaguerat.dm
2021-09-25 19:17:43 -04:00
zeroisthebiggay
58df5b70bf
Update plaguerat.dm
2021-09-25 19:09:22 -04:00
Hatterhat
e141df3600
weirdchamp
2021-09-24 23:16:46 -05:00
Hatterhat
fd6e97b935
grr
2021-09-24 23:08:15 -05:00
zerothebigboy
3e1f5326e3
buggers
2021-09-24 22:25:53 -04:00
Lin
c991a3004a
Merge pull request #15192 from buffyuwu/accordion
...
ports a downstream fix of accordions
2021-09-24 19:14:14 -05:00
Hatterhat
784cd2ca7d
ballin
2021-09-24 19:12:04 -05:00
zeroisthebiggay
662807042d
Update uplink_dangerous.dm
2021-09-23 22:14:09 -04:00
WanderingFox95
9464ad8061
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-24 00:59:57 +02:00
zeroisthebiggay
7ba7f0d1c1
gremlins become shock immune ( #15183 )
...
* Update gremlin.dm
* Update gremlin.dm
2021-09-23 19:20:15 +02:00
Lin
f8ac9af6d0
Merge pull request #15187 from KrabSpider/krabgenics
...
blacklists cryogenics from anomaly spawns
2021-09-22 14:50:28 -05:00
Lin
4e9e98367f
Merge pull request #15190 from buffyuwu/canvas
...
adds art supplies to the fun vendor
2021-09-22 14:49:57 -05:00
buffyuwu
2522b84667
ports a downstream fix of accordions
...
while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee
2021-09-22 01:56:13 -04:00
keronshb
271047cf9f
Ninja Change
2021-09-21 17:42:02 -04:00
WanderingFox95
d8aa29a16e
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-21 14:49:15 +02:00
buffyuwu
dbd6014129
adds art supplies to the fun vendor
...
because some maps don't have the canvas/easel
🆑
add: canvas and spraycan are now sold in the fun vendor
/🆑
2021-09-21 01:16:03 -04:00
Lin
ad4cb7ea0e
Merge pull request #15182 from Citadel-Station-13/silicons-patch-3
...
reverts my limb damage changes
2021-09-21 00:00:20 -05:00
Lin
a084733397
Merge pull request #15179 from Citadel-Station-13/why
...
adds policy configs for elite fauna and prisoner role
2021-09-20 23:58:21 -05:00
Lin
318a80370e
Merge pull request #15184 from Citadel-Station-13/silicons-patch-5
...
Fixes crawling not overriding new reagent speedups
2021-09-20 23:53:26 -05:00
buffyuwu
eb43981dea
adds 4 loadout jackets
...
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.
also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown
🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
2021-09-20 19:04:47 -04:00
KrabSpider
11a414d8c8
blacklists cryogenics from anomaly spawns
...
adds cryogenics to the anomaly blacklist.
2021-09-20 16:41:40 -04:00
