Commit Graph

19334 Commits

Author SHA1 Message Date
Runa Dacino
fff4e9ffc5 Implements new machine that creates autoinjectors en masse 2023-02-12 21:03:07 +01:00
Spookerton
7da09c462f Merge pull request #8929 from Cerebulon/powersink-sprite
Fixes powersink having no sprite
2023-02-05 10:08:51 -05:00
Heroman3003
4aa23a5874 Merge pull request #14430 from VOREStation/upstream-merge-8905
[MIRROR] Removes unused mecha damage absorbtion list.
2023-02-05 07:48:05 +10:00
Heroman3003
11490f3430 Update utility.dm 2023-02-05 07:22:57 +10:00
Heroman3003
43bdd9658a Update security.dm 2023-02-05 07:22:50 +10:00
Heroman3003
dc7a28a36a Update micro.dm 2023-02-05 07:22:39 +10:00
Heroman3003
7ef71b6755 Update phazon.dm 2023-02-05 07:04:19 +10:00
Heroman3003
18e989b84c Merge pull request #14428 from VOREStation/upstream-merge-8915
[MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
2023-02-05 06:57:51 +10:00
Spookerton
68022d927c Removes unused mecha damage absorbtion list. 2023-02-04 15:33:13 -05:00
Spookerton
c5e353fab7 Merge pull request #8915 from Seris02/letmeCLEAN
allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
2023-02-04 15:31:56 -05:00
TheGreatKitsune
f726f7553b Add required components to circuit board examine text 2023-02-04 11:28:37 -06:00
Heroman3003
39bf1f05a6 Merge pull request #14414 from Runa-Dacino/NIFrepairtoolfix
Fixes NIF repair tool using up nanopaste when full
2023-02-04 04:38:06 +10:00
Runa Dacino
9d45e8bc49 Fixes adv nif-repair tool eating nanopaste when full 2023-02-03 15:19:15 +01:00
Cyantime
330f696109 Fixes #14409 2023-01-31 17:24:32 -05:00
Atermonera
f326dddfa9 Tiny grammar tweaks 2023-01-29 18:27:45 -05:00
Heroman3003
f37df09d38 Merge pull request #14384 from Runa-Dacino/Custom-species-heat
Adds ability to customize discomfort
2023-01-29 08:12:30 +10:00
Heroman3003
6c51eeb93e Merge pull request #14387 from VOREStation/upstream-merge-8894
[MIRROR] Simple animal flavour text will now show instead of desc, if set.
2023-01-27 19:13:50 +10:00
Heroman3003
f8e75bfab2 Update atoms.dm 2023-01-27 18:27:18 +10:00
Atermonera
050ac42b8f Merge pull request #8898 from MistakeNot4892/frosty
Lowers frostbelle point value, increases rarity.
2023-01-27 01:49:27 -05:00
Atermonera
5029a6b611 Simple animal flavour text will now show instead of desc, if set. 2023-01-26 22:41:20 -05:00
Runa Dacino
996c483f89 Adds ability to customize discomfort
Both pre-made and custom species may now choose up to 10 messages each for warnings while overheated or cold.

If there are no custom messages, game falls back to defaults (which, if the pre-baked species lacks fluff, uses human)

There is a way to reset to defaults.

It is possible to go back and edit any of the 10 messages. The editor shows you the previously set message with an option to cancel out (this avoids over-writing the previous message).
2023-01-26 01:09:37 +01:00
Runa Dacino
b07c9e3227 Time travel fix! 2023-01-24 14:45:08 +01:00
Heroman
0aa925be1f Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 13:48:03 +10:00
Killian
a403fa06f9 [TILT WARNING]
Now a toggle
2023-01-20 13:18:33 +00:00
Heroman3003
fd94efe521 Merge pull request #14336 from VOREStation/upstream-merge-8870
[MIRROR] Repairing light robotic damage messaging fix
2023-01-19 13:20:04 +10:00
Heroman3003
ec2ea599ed Update weldingtool.dm 2023-01-19 12:33:24 +10:00
Heroman3003
869632d7eb Merge pull request #14344 from Seris02/emissiveborgs
better persistent dirt
2023-01-19 12:31:45 +10:00
Seris02
5df1af5009 very nice dirt code 2023-01-17 15:02:28 +08:00
Seris02
20aa3c29d6 almost made a terrible mistake with dirt 2023-01-16 18:20:01 +08:00
Seris02
9f039abe7e even better dirt code 2023-01-16 16:57:48 +08:00
Heroman3003
861466d134 Merge pull request #14332 from VOREStation/upstream-merge-8868
[MIRROR] Blobs do damage to mechs
2023-01-16 18:44:30 +10:00
Heroman3003
a745af0363 Merge pull request #14330 from Novacat/nova-basicfixes
Uplink and Pouch Tweaks
2023-01-16 18:44:18 +10:00
Seris02
eacb52abf2 undoes part of that last commit 2023-01-16 14:52:56 +08:00
Seris02
e634c802bb better dirt persistence 2023-01-16 14:30:11 +08:00
Atermonera
1966acb410 Repairing light robotic damage messaging fix 2023-01-15 14:04:19 -05:00
Atermonera
0996440932 Merge pull request #8868 from Atermonera/mecha_blob_act
Blobs do damage to mechs
2023-01-15 13:56:38 -05:00
Unknown
be255c4b4f Uplink and Pouch Tweaks
- Adds capture crystals to uplink
- Swaps bluespace pouch for normal pouches in uplink
- Small pouches are slightly less cumbersome, large pouches slightly more cumbersome
- Reduced storage of bluespace pouches to be consistent with bags of holding
2023-01-14 22:42:16 -05:00
Heroman
d2e2bf9d66 Makes all carpet types orderable and gives them tile icons 2023-01-13 17:15:44 +10:00
VerySoft
0a09880fd8 fixes RP seasonal subtypes and adds seasonal water 2023-01-08 14:32:52 -05:00
Heroman
655116c3d1 Fixes personal lockers robbing borgs of their modules 2023-01-04 15:59:46 +10:00
VerySoft
5a3d0aa09b This too 2023-01-03 17:01:55 -05:00
Heroman
68981659fa Replaces RP's carp and jellyfish events with new Roaming Wildlife event 2023-01-03 19:38:32 +10:00
Casey
5f0fb16e59 Merge pull request #14279 from Very-Soft/seasontime
More RP seasons edits
2022-12-31 00:08:47 -05:00
VerySoft
493c8edb79 Round 2 2022-12-30 23:45:11 -05:00
Heroman
21fa63b533 Fixes two admin bugs 2022-12-31 14:18:17 +10:00
VerySoft
8529b42dfc Brings Seasons to RP! 2022-12-30 22:23:17 -05:00
Casey
6eacab6772 Merge pull request #13926 from Very-Soft/attheend
Time for Seasons
2022-12-30 16:08:58 -05:00
Heroman3003
ead06fc630 Merge pull request #14271 from Novacat/nova-basicfixes
Miscallaneous Tweaks
2022-12-31 07:05:27 +10:00
Heroman3003
a533de71c6 Merge pull request #14269 from Heroman3003/borg-event-stuff
Adjusts events and refactors borgs a bit in process
2022-12-31 07:04:47 +10:00
Heroman3003
7bcdafa4f2 Merge pull request #14264 from Heroman3003/chaircolors
Fixes comfy chair colors
2022-12-31 07:04:41 +10:00