Commit Graph
3357 Commits
Author SHA1 Message Date
izac112 aa8016bddd Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2025-01-14 02:20:30 +01:00
35172fd5eb Midweek bugfix release (#16867)
* fix adminjump to area (#16853)

* fix a runtime in the keyloop (#16852)

* fix a runtime in the keyloop

* also fix that

* gloves runtime

* do it proper

* fix stun effect act (#16850)

* fix a runtime and some usr to user (#16849)

* fix a runtimg and some usr to user

* .

* .

* more usr

* fix some bad replaces (#16856)

* fix a lot of map issues (#16857)

* fix a lot of map issues

* fix SM template...

* fix change turf (#16860)

* Fluff item for Beeholddrbeesphb/Evelynn (#16859)

* Fix synth_color not working (#16866)

* Fix synth_color not working

* Fix spawnpoint pref

* living

* oups

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
2025-01-08 16:05:01 +01:00
KashargulandGitHub 59b9802628 some istype to macros (#16826) 2025-01-06 06:45:02 +10:00
KashargulandGitHub 987be6070d bunch of inits without return and a few easy new to init (#16815)
* bunch of inits withou return

* Update cans.dm

* bunch of New to Init

* fix that

* .

* .

* move black hole to init and callbacks

* .

* oups, should not do that late at night

* some more without returns
2025-01-02 18:31:38 +01:00
KashargulandGitHub e6ef8b0f2c resize limits and designer / dna update (#16807)
* resize limits and designer / dna update

* .

* genes to mobs

* .

* Update designer.dm

* Update designer.dm

* species cleanup
2025-01-01 18:23:20 +10:00
izac112 eeddf8f793 Makes its so the sanity check actually runs 2024-12-30 21:46:59 +01:00
izac112 a64cbd6e9a Merge branch 'voreupdate' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-30 21:16:49 +01:00
KashargulandGitHub 7c8471db72 fix hooded wintercoat action staying (#16778) 2024-12-29 13:47:47 +01:00
izac112 5a63e93153 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-28 14:43:02 +01:00
Cameron LennoxandGitHub 12c308a9d5 Makes firefighter hats not useless in firees (#16732)
Firefighter hats didn't have heat_protection = HEAD
This resulted in them doing...Nothing.
2024-12-18 21:15:10 +10:00
KashargulandGitHub 542ed02976 fix rigs going permanently offline and some radio stuff (#16721)
* fix rigs going permanently offline

* .

* also fix those

* .
2024-12-16 10:08:29 +10:00
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
Kashargul 1a2c2c0764 plants 2024-12-08 05:51:35 +01:00
Kashargul e9550345d2 half of the food and drinks 2024-12-08 01:14:10 +01:00
Kashargul 1d8d5b34b5 medicine.dm 2024-12-07 02:10:10 +01:00
Kashargul a12a4d2d5e toxins.dm 2024-12-07 01:03:25 +01:00
KashargulandGitHub 939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
Kashargul 429398bdd7 some moire 2024-12-06 21:54:05 +01:00
Heroman3003andGitHub 9941ffa8dc Merge branch 'master' into areaStuff 2024-12-07 05:14:52 +10:00
Kashargul 80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
izac112 0fa0bc3ed0 Fixes 2024-12-06 00:25:08 +01:00
Kashargul ead0180057 converts area vars to flags 2024-12-04 22:21:38 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
KashargulandGitHub 07958d0657 Merge branch 'master' into protRig 2024-11-28 15:57:44 +01:00
KashargulandGitHub 2fdde73d3a Merge branch 'master' into protRig 2024-11-27 23:58:52 +01:00
Kashargul 938ab8af7c Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects 2024-11-27 23:53:06 +01:00
Heroman3003andGitHub 3a77e0b747 Merge pull request #16619 from SatinIsle/let-me-wear-wristbands
Allows wristbands and bracelets to attach to uniforms again
2024-11-28 05:35:27 +10:00
Heroman3003andGitHub 9bc748eb8e Merge pull request #16611 from TankTheBirb/fix-blindfold
Hides your eyes when wearing blindfolds
2024-11-28 05:33:30 +10:00
Killian c80b0df3d4 recolourable fingerless gloves parity 2024-11-23 22:45:20 +00:00
SatinIsle 9fe0817337 Allows wristbands and bracelets to attach to uniforms again
Fixed wristbands and bracelets being unable to be attached to uniforms, causing them to spawn in the backpack and only one to be worn at a time.
2024-11-18 16:50:28 +00:00
TankTheBirb 66d31c496d Hides your eyes when wearing blindfolds
eye flavor text is now hidden by blindfolds. Technically you could do this by putting it under sunglasses instead, but I didn't want to check every child of the sunglasses for what it'd do.

🆑
tweak: makes blindfolds cover the eyes flavor text
/🆑
2024-11-17 15:37:44 -05:00
Kashargul 32c9f971bc tgui usr to ui.user 2024-11-13 00:49:17 +01:00
KashargulandGitHub 607614e217 Merge branch 'master' into protRig 2024-11-12 20:35:51 +01:00
Killian 44f643b13d Merge remote-tracking branch 'upstream/master' into kk-rings 2024-11-10 15:12:24 +00:00
Killian 361effe064 bracelet refactor 2024-11-10 15:11:05 +00:00
KillianandGitHub 7106b4a2b9 choker tweak (#16575) 2024-11-09 15:46:06 +01:00
Killian 26503760bf melee damage adjustments 2024-11-08 11:06:49 +00:00
Killian 7c0942e8b0 restore bonus damage w/o gloves 2024-11-08 10:49:57 +00:00
Killian 9fff34e6ad attachable knuckledusters and force transfer 2024-11-07 03:06:56 +00:00
KillianandGitHub 90497326d6 Merge branch 'master' into kk-rings 2024-11-06 14:58:43 +00:00
4879a52633 Server maint subsystem (#16518)
* upports server maint subsystem

* fix runtime in admin z narrate

* .

* sorts them verbs

* .

* .

* Update code/controllers/subsystems/statpanel.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/controllers/subsystems/server_maint.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-04 11:44:44 +01:00
Kashargul 2e5e6c36a8 protean rigs, no dmis 2024-11-03 02:07:23 +01:00
ShadowLarkensandGitHub 152c3fe29e Revert "Add support for deploying space helmets over top of other helmets (#16475)" (#16545)
This reverts commit a046ae1fa7.
2024-10-31 02:41:21 +01:00
Killian f865da7a6f Update rings.dm 2024-10-29 01:35:28 +00:00
Killian 3ff9ace3b9 Merge remote-tracking branch 'upstream/master' into kk-rings 2024-10-29 01:00:23 +00:00
Killian 4869595855 ring/watch accessory transfer 2024-10-29 00:23:23 +00:00
CaseyandGitHub 8f2a31927a Merge pull request #16528 from SatinIsle/bunny-things
Bunny suits
2024-10-27 12:42:43 -04:00
ShadowLarkensandGitHub a046ae1fa7 Add support for deploying space helmets over top of other helmets (#16475)
* Add support for deploying space helmets over top of other helmets

* Make all /obj/item/clothing/head/helmet overhead
2024-10-27 14:33:56 +01:00