Commit Graph

1872 Commits

Author SHA1 Message Date
TheDavestDave
2fd071e2d7 captails gone 2022-02-05 15:57:09 +00:00
TheDavestDave
c2cc35f59d makes amour for lucky
it took three people to get this to work correctly
2022-02-04 22:09:04 +00:00
TheDavestDave
9206834c79 I fixed the sprite problem
please don't ask me how I have no idea
2022-01-09 19:11:23 +00:00
TheDavestDave
edbb90b2a5 more attempts to get things to work 2022-01-09 18:57:43 +00:00
TheDavestDave
9d327854b8 adds medical colours of explo crusader
adds a medical sprite for the explo knight amour to load out
2022-01-09 18:26:17 +00:00
Casey
62a6177d87 Merge pull request #12044 from TheDavestDave/dnd-explo-amour
Dnd explo amour
2022-01-08 12:51:32 -05:00
Casey
89d5b8ec9c Merge pull request #11944 from Heroman3003/nifnerf
Makes NIFs not get automatically lost (hopefully)
2022-01-08 12:39:30 -05:00
TheDavestDave
b1a23cad0c adds loadout alt to explo green suit
makes it a real item, adds it to load out. It has copy pasted stats to the green suit explo has.
2022-01-04 16:05:21 +00:00
Heroman
9106a08f1a Makes NIF save on every durability change 2021-12-26 05:57:32 +10:00
Little-119
2a092574d8 Merge branch 'master' into ckey-transfer 2021-12-13 20:42:12 -05:00
Runa Dacino
f858ca2a42 Bugfixing, style changes
Tried to make the loadout versions follow convention.

Fixed path issue with vendor, changing "/chemist" to "/chem"
2021-12-08 18:24:52 +01:00
Runa Dacino
8fad281f41 Brings back labcoats before fulp PR
While the labcoats provided by fulpstation do look rather nice, I find myself yearning for the original icons. They look "sharper", more "ironed."

At this point, I'm only bringing back departmental wear, since the coloured labcoats aren't that different. I may bring back the coloured ones too.

Labcoats were added to the vending machines too, for in-round use.

At loadout, at the moment, anyone may use the purple/green/yellow trim labcoats, as I'm yet to figure out how to do that.

However, seeing that the security poncho is available to everyone too... I think it's not an issue.
2021-12-08 17:39:27 +01:00
Heroman
a3f950b01e Admin midis and english grammar 2021-12-06 19:25:23 +10:00
Heroman
26e5b8b0c1 Standartizes names and clarifies descriptions of Preferences Tab verbs 2021-12-06 17:13:25 +10:00
faaaay
c5040421f2 adds fluff/jade_horror stamp 2021-12-03 20:19:21 +00:00
Casey
68fe0fbcc3 Merge pull request #11947 from PastelPrinceDan/fwuff
pastelprincedan & hatterhat fluff items
2021-12-02 22:39:38 -05:00
Casey
60011ecd0b Merge pull request #11928 from Very-Soft/whalesandcrystals
Offmap Tweaks
2021-12-02 19:56:25 -05:00
Casey
89ac4fbf89 Merge pull request #11920 from Verkister/patch-103
Probably fixes xenowear loadout reset bug
2021-12-02 14:41:24 -05:00
Hatterhat
b88c3f5c8b mechanic drip one entry 2021-12-02 13:37:59 -06:00
PastelPrinceDan
f495259fe9 typo fix + alphabetical order
im sleepy
2021-12-02 19:06:04 +00:00
PastelPrinceDan
57cb099590 fwuff item owo 2021-12-02 18:59:31 +00:00
Heroman
f747a6213d Makes NIFs not get automatically lost (hopefully) 2021-12-01 21:05:06 +10:00
VerySoft
d6bf641205 Updoot 2021-11-28 21:30:27 -05:00
Heroman
f745f99b16 Adds Amaryll's claws fluff item 2021-11-28 10:33:50 +10:00
Verkister
7dbd2e1668 Probably fixes xenowear loadout reset bug
Fixing the same thing I did with the language reset bug by adding a requirement for client presence on setup sanitizations involving whitelist checks that will automatically fail if client is missing, such as when getting dunked into cryo/whatever while SSD etc.
2021-11-23 23:32:26 +02:00
Casey
0177128eea Merge pull request #11909 from Heroman3003/deencode
Fixes loadout items with apostrophes not being adjustible
2021-11-22 23:42:01 -05:00
Casey
37e1d71406 Merge pull request #11892 from Heroman3003/beardkin
Allows Shadekin to use beards
2021-11-22 23:34:30 -05:00
Casey
3584da94e0 Merge pull request #11875 from Heroman3003/synthtrait
Fixes bugs related to organic/synthetic exclusive traits disappearing
2021-11-22 23:19:44 -05:00
Heroman
0684b0e202 Fixes loadout items with apostrophes not being adjustible 2021-11-23 06:59:59 +10:00
Heroman
30e116e75c Allows Shadekin to use beards 2021-11-22 06:36:18 +10:00
Heroman
3d3baeb4f5 Fixes bugs related to organic/synthetic exclusive traits disappearing 2021-11-21 13:17:52 +10:00
Heroman
5438a64e64 Adds prefs for Corgi and Cursed Sword roles 2021-11-21 12:42:53 +10:00
Little-119
9ef559730c Ckey transfer 2021-11-18 17:16:02 -05:00
Casey
0502970c3f Merge pull request #11752 from Heroman3003/jobstuff2
Renames Engineer, new alt-titles for Stellar Delight
2021-11-06 03:44:47 -04:00
Hatterhat
dc1559a150 gaiter 2 2021-11-02 19:06:11 -05:00
Heroman
dbe9387f5f Renames Engineer, new alt-titles for Stellar Delight 2021-11-02 19:56:49 +10:00
Heroman
4b38fb9034 Modularizes SD files a bit 2021-10-31 08:42:18 +10:00
klaasjared
56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
Aronai Sieyes
a826bcd330 Merge pull request #11712 from KillianKirilenko/kk-misc2
Customverb tweak
2021-10-27 14:17:35 -04:00
PastelPrinceDan
86627bfa9c no conflicts this time please, 2021-10-27 18:27:30 +01:00
Casey
18fa28a431 Merge pull request #11698 from GhostActual/toolz
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
Casey
c1ab2b86de Merge pull request #11643 from Verkister/patch-87
Fixes the language reset bug
2021-10-27 11:22:56 -04:00
Casey
086d348e2f Merge pull request #11642 from PastelPrinceDan/mask
paper masks, emotional mask
2021-10-27 11:22:30 -04:00
Casey
44eb5dd30b Merge pull request #11608 from VOREStation/upstream-merge-8304
[MIRROR] Removes suicide verb function
2021-10-27 11:10:00 -04:00
Killian
d8385d8899 customverb tweak
enforces lowercase for custom verbs
2021-10-27 10:02:00 +01:00
Aronai Sieyes
b9ba661b8b Merge pull request #11603 from VOREStation/upstream-merge-8253
[MIRROR] By-species age restrictions
2021-10-24 20:36:41 -04:00
Aronai Sieyes
d89dd0cfd6 Removes suicide verb function 2021-10-24 20:35:36 -04:00
klaasjared
fd2032bec7 Adds in flashlights from #11488 2021-10-23 00:10:33 -04:00
Aronai Sieyes
d85b806091 Merge pull request #11572 from VOREStation/upstream-merge-8272
[MIRROR] Expands the ring selection
2021-10-22 14:39:18 -04:00
PastelPrinceDan
e34f8e6414 joy mask 2021-10-01 00:06:45 +01:00