Novacat
4dbc7fe6bf
Merge branch 'master' into upstream-merge-8298
2022-03-22 08:53:45 -04:00
Casey
1b0bd0d1a3
Merge pull request #12508 from lm40/master
...
Fixes typo in grub announcement
2022-03-21 23:00:23 -04:00
Casey
9f206df027
Merge pull request #12506 from BonniePandora/Comp-shotgun-updoot
...
Overhauls the warden's compact shotgun stock-folding
2022-03-21 23:00:16 -04:00
Casey
653680192e
Merge pull request #12505 from GhostActual/New-Alien-Organs
...
New Alien Organ Sprites
2022-03-21 22:59:52 -04:00
lm40
aadbddc8c0
Fixes typo
2022-03-21 22:05:52 -04:00
Pandora
7172b97982
Ne Ne Ne Ne...
2022-03-21 21:55:37 +00:00
GhostActual
61462f99e8
Base Commit
2022-03-21 16:32:15 -04:00
GhostActual
d4f6914140
Base Commit
2022-03-21 15:38:31 -04:00
Killian
0b1f139046
Update xeno.dm
2022-03-21 18:53:49 +00:00
Casey
8249758d29
Merge pull request #12501 from Very-Soft/reg
...
I forgot to remove the debug logging on reg
2022-03-21 06:07:47 -04:00
Casey
e1f20bae13
Merge pull request #12500 from GhostActual/pride_pins
...
Show off your Pride
2022-03-21 05:54:04 -04:00
VerySoft
74cfb5e386
I forgot to remove the debug logging on reg
...
wow!
2022-03-21 05:49:01 -04:00
GhostActual
3d6e55b45b
Base Commit
2022-03-21 05:37:38 -04:00
GhostActual
96d2da15a3
Base Commit
...
Update shotgun.dm
Final Commit?
Final
2022-03-21 05:02:08 -04:00
Casey
ced7ea52f1
Merge pull request #12495 from Verkister/patch-110
...
fixes lighting turf opacity runtime spam
2022-03-20 18:38:09 -04:00
Casey
761ebc2930
Merge pull request #12494 from FartMaster69420/prommie-blob
...
Fixing Blob Hats
2022-03-20 18:30:52 -04:00
Casey
68136b60ab
Merge pull request #12493 from VOREStation/upstream-merge-8443
...
[MIRROR] Drill quality now affects mining speed
2022-03-20 18:30:38 -04:00
Verkister
cc4b896956
fixes lighting turf opacity runtime spam
...
mmm delicious null entries just love turning all these for-as-anything-in-lists into endless runtime generators.
2022-03-21 00:27:28 +02:00
Casey
d19e967043
Merge pull request #12480 from VOREStation/upstream-merge-8437
...
[MIRROR] Skrell markings & hair angle consistency
2022-03-20 15:44:53 -04:00
Casey
8139712fb9
Merge pull request #12483 from Screemonster/rainbowtrout
...
improves fishing hars with VIBRANCY
2022-03-20 15:43:38 -04:00
FartMaster69420
54983b8dc8
Fixing hat color!
...
This also fixes it for xenobiology slimes.
2022-03-20 15:41:05 -04:00
Atermonera
39be37182e
Drill quality now affects mining speed
2022-03-20 15:36:18 -04:00
Atermonera
9ee3843499
Merge pull request #8451 from Verkister/patch-87
...
Fixes universal_understand keeping mobs illiterate
2022-03-20 15:31:25 -04:00
DESKTOP-4BUBN9N\Mike
e1e0376d66
adds coloured hats, more messages
2022-03-20 19:21:09 +00:00
listerla
dfa2a9bcc4
Skrell markings & hair angle consistency
2022-03-20 15:13:04 -04:00
Casey
8c2a8f75e4
Merge pull request #12469 from VOREStation/upstream-merge-8428
...
[MIRROR] Makes the chirp emote available to Zaddat
2022-03-20 15:11:03 -04:00
Casey
8cc1fc2fe8
Merge pull request #12470 from VOREStation/upstream-merge-8427
...
[MIRROR] Remove evening gloves temp. protection
2022-03-20 15:10:45 -04:00
Casey
aa1fce2d49
Merge pull request #12471 from VOREStation/upstream-merge-8426
...
[MIRROR] Prometheans now do not clean items through gloves.
2022-03-20 15:10:26 -04:00
Casey
0646c6e9b9
Merge pull request #12472 from VOREStation/upstream-merge-8425
...
[MIRROR] fixes puke coating stealing nutriment reagent's id
2022-03-20 15:09:49 -04:00
Casey
0718502c45
Merge pull request #12474 from VOREStation/upstream-merge-8430
...
[MIRROR] Fixes holodeck landmarks not clearing themselves
2022-03-20 15:08:46 -04:00
Casey
d4f1a9f66e
Merge pull request #12475 from FartMaster69420/prommie-blob
...
Fixing color bug
2022-03-20 15:08:33 -04:00
Atermonera
73531a77e8
Merge pull request #8430 from Verkister/patch-86
...
Fixes holodeck landmarks not clearing themselves
2022-03-20 14:57:05 -04:00
FartMaster69420
e6ee9d6ff2
Fixing color bug
...
A small bug was found when solid white (FFFFFF) blobs turned into prometheans, resulting in the promethean being the incorrect color. This fixes that issue.
2022-03-20 14:56:56 -04:00
Atermonera
a7ed6aca2b
Merge pull request #8425 from Verkister/patch-85
...
fixes puke coating stealing nutriment reagent's id
2022-03-20 14:54:50 -04:00
Atermonera
6e6c2c7c3e
Merge pull request #8426 from Mechoid/PrometheanHandClean
...
Prometheans now do not clean items through gloves.
2022-03-20 14:54:42 -04:00
Atermonera
a6ed678cb8
Merge pull request #8427 from KillianKirilenko/kk-minifix
...
Remove evening gloves temp. protection
2022-03-20 14:54:36 -04:00
Atermonera
1680f559ff
Merge pull request #8428 from listerla/zaddatchirp
...
Makes the chirp emote available to Zaddat
2022-03-20 14:54:30 -04:00
Pandora
f51689296d
removes the bag from loadout selection
2022-03-20 17:02:24 +00:00
VerySoft
ff6079ff0d
Promethean blobs should understand the radio now.
2022-03-20 06:07:31 -04:00
Casey
f233c511e7
Merge pull request #12451 from FartMaster69420/prommie-blob
...
Promethean Blobform
2022-03-20 02:45:08 -04:00
FartMaster69420
c5b52849b1
Saving the blob instead of deleting it
...
Saves the blob instead of deleting it!
2022-03-20 01:57:56 -04:00
Casey
99c3578aee
Merge pull request #12461 from Heroman3003/protean-food
...
Adjustments to synthetic food processing
2022-03-19 23:13:25 -04:00
Casey
e45c901f7c
Merge pull request #12443 from GhostActual/detective_guns
...
Colts, Revolvers, and Tasers
2022-03-19 23:10:15 -04:00
Heroman
3a733a0fee
Moves reagent_purge verb for proteans from orchestrator to refactory
2022-03-20 09:36:47 +10:00
Heroman
17208385cb
Allows synths to process food in bloodstr too
2022-03-20 09:32:43 +10:00
Heroman
4e6c965074
Adjustments to synthetic food processing
2022-03-20 09:31:52 +10:00
Casey
42f6ef9895
Merge pull request #12460 from Very-Soft/runtimetime
...
Should fix runtime
2022-03-19 18:15:21 -04:00
VerySoft
ef952f0482
Should fix runtime
...
New pref check was causing runtime.
2022-03-19 17:58:41 -04:00
PastelPrinceDan
032d9e80dc
plushie :)
2022-03-19 21:24:13 +00:00
Casey
d196eedca3
Merge pull request #12457 from Heroman3003/pred-bottom
...
Adds Submit To Prey Trait
2022-03-19 00:42:36 -04:00
