Commit Graph
127 Commits
Author SHA1 Message Date
640cab345e Virology Update #3 (#17227)
* Base stuff

* Thresholds

* Cockroaches, adjustments

* Extrapolator + TGUI Update

* Adjustments

* Updoot

* Revert "Updoot"

This reverts commit 8c27a2525e.

* Gwuh

* test

* heals

* Genetic

* Holder and vomit

* Indents

* Compilable :)

* Various fixes

* Updates Symptoms

* Genevirus

* Neutered Symptoms

* Adjustments

* rads

* Extra symptoms

* Extra extra symptoms

* Adjustments, fixes, more symptoms

* Powder that makes the linter green

* Finishing touches?

* Fixup maps in TGM format

5041170ae1: maps/expedition_vr/beach/submaps/quarantineshuttle.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Last bits

* Defines

* Oxy heal

* I crave the green check

* fix

* Maps

* Macrophages to turf

* Fimxes

* Fixes :)

* Vomit

* Preset

* Fire desc

* SPELLING MISTAKE

* Extra stuffs

* types

Allows infecting children of a type

* feet

paws?

* fix

* Fixes

* Update

* Flags

* Update _disease.dm

* Infinite blood glitch (100% real)

* virus data properly carries over

* GODSPEED, KELENIUS

YOUR 10 YEAR TODO IS FINALLY DONE

* define

* U2

* Implicit

* Damn it Fleming

* oops

linter is kill

* Update _reagents.dm

* Extra check

* .

* ough

* fixes

* Small changes

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-04-21 06:12:15 -04:00
Cameron LennoxandGitHub 95e3bf67c4 VR pod and mob TF fixes & adjustments (#17397)
* Makes VR not crash the server

- Makes mouse rays no longer crash the server under certain circumstances
- Makes VR pods no longer crash the server (Method #1)
- Makes VR pods no longer crash the server (Method #2)
- I think there was a third method to crash the server with VR pods. That got fixed too. If it existed.
- Updates TF and makes it no longer cause runtimes & crashes.
- Makes it so you can no longer repeatedly spawn in VR and clog up the server with hundreds of yourself (humanoids are expensive!)
- Adds a greyscale effect for reconverting TF rays
- Added a toggle for VR pods to spawn people with clothing or not
- Ghosts now have a button to enter the VR space if it's spawned in!
- Ghosts can now enter VR if it's spawned in!
- Adds the ability to TF into different creatures while in VR

* turfs

* moving stuff around

also small drippy fix while at it

* shhhh

* Update ar_console.dm
2025-03-21 21:58:25 +01:00
KashargulandGitHub 1def015bad end of file Fix (#17308)
* end of file Fix

* fix those lints too
2025-03-10 16:15:35 -04:00
4fe99bd865 Various upports (#17061)
* Mail

* Updoot

* Stuffs

* Updoot

* oops

* Change

* usr + span_notice

* fix

* Forgot the gelatin :(

* MORE gelatin

* Proper Gelatin :)

* Gelatin shall not be a juice

* And gives it an ID of course

* deconf

* adds the missing worn sprites

* enables this since guti's pr gets merged

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
2025-03-03 10:39:38 -05:00
6a157d8614 Rig glovefix and Clothing protection fix (#17118)
* Fixes RIG gear to not drop your equipped items

Fixes the rig gear to not drop your equipped gear after undeployment

* better fix

* Fixes suits and RIGS

- Makes rigsuits no longer eat your gloves
- Allows you to properly wear a ring under a rigsuit
- Gets rid of a LOT of duplicate var  = XYZ in places
- Makes it so clothing actually properly provide protection to the areas they're covering. (This doesn't change anything unless their actual min_cold_protection or max_heat_protection is adjusted!)
- Adds a define for CHEST which is just UPPER_TORSO|LOWER_TORSO to make it clear it's protecting your WHOLE chest at a glance.
- Gives some things like knee-high and thigh-high boots proper leg protection

* Clothing unit test

* fixes

* oops

* hoods are snowflakes

* hood fix

* path fix

* no nullspace turf

* nullcheck

* don't test devwarning cloths

* ignore this too

* more exclusions

* more exclusions, disabled species test

* Changes So Far

* holding/wearing icons for clothing

* fixed

* more fixes

* lets try this again

* go

* tesh cloak

* some more

* devwarning

* the cursed one

* oops

* fixed species scan

* Update clothing.dm

* restrict this down a bit more, we don't want unit-test to choke

* no more CI killer

* suit defined name twice

* suit

* some more exclusions

* etc

* gwah

* gwah

* clarifying exclusions

* yet more exclusions

* another set of exclusions

* ranger

* compile

* more bitflag

* yet more exclusions

* more

* more missing

* Update sifguard.dm

comment (also to wake up travis)

* more exclusions

* sifguard

* more exclusions

* more

* send help, yes more exclusions

* lost to time

* skrell stuff

* offear is special

* fixes more and unbreaks protean rigs

* The big one

* wrong ifdef

* more

* boots

* Update accessory.dm

* small object fix

* lets be more careful

* Does this fix the signal

* is it the signal?

* FIXES THE REST OF THEM

* wah

* disable test

* the last one

* fix signal check

* fixes

* ignore storage

* teshari blacklist

* tesh

* God speed

* fixed progression removed lizard

* fixes some i guess but what's the point

* disable indepth check

* START ROBOT SPRITE VALIDITY

* Revert "START ROBOT SPRITE VALIDITY"

This reverts commit c9bfb7e9ce.

* consistency with another test

* yuh uh

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
2025-03-01 11:56:30 -05:00
Killian 9a17931d86 default jacket toggle 2025-01-14 18:57:51 +00:00
Killian ee0653dbb2 lurker outfit fixes 2024-12-10 04:40:51 +00:00
Killian 01813cd4d0 maint lurker setup 2024-12-04 12:22:40 +00:00
Killian c00e6f3d4d Merge remote-tracking branch 'upstream/master' into kk-charpod 2024-11-27 20:37:02 +00:00
Killian e016744474 straggler pod: job/role finish 2024-11-27 12:12:03 +00:00
Killian 69a1609848 straggler pod: job/role WIP 2024-11-27 10:37:57 +00:00
Killian 88408477ec headset sets 2024-11-25 12:45:52 +00:00
2c11b12814 Headset Refactor and Selection (#16568)
* headset refactor and selection

* Update headset.dm

formatting

* Update code/modules/client/preference_setup/general/04_equipment.dm

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

* Update code/_helpers/global_lists.dm

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

* Update code/modules/client/preference_setup/general/04_equipment.dm

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

* Update code/modules/client/preference_setup/general/04_equipment.dm

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

* Update code/modules/client/preference_setup/general/04_equipment.dm

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

* Update code/modules/client/preference_setup/general/04_equipment.dm

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

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-06 18:49:11 +01:00
Killian c35bb9830a headset refactor and selection 2024-11-05 11:42:27 +00:00
KashargulandGitHub 113422b448 . 2024-10-04 18:50:44 +02:00
Guti 06a46a237b stuff 2024-09-18 18:12:57 +02:00
Guti f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul 7fa41d248f alt titles and order 2024-09-14 04:20:37 +02:00
Kashargul b041bca268 some alt titles 2024-09-13 23:00:17 +02:00
Kashargul a123f87e68 some mind jobs 2024-09-12 23:48:31 +02:00
Kashargul 8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul 4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Kashargul 8a3520e2e0 move all factions to defines 2024-09-12 20:17:41 +02:00
Kashargul 10dc8510b3 up to engineer 2024-09-12 02:01:36 +02:00
Kashargul 0425a4e396 up to officer 2024-09-12 00:00:11 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
SatinIsleandGitHub 711f99944e Entrepreneur Expansion (Part 1) (#15933)
* [WIP] Entrepreneur Expansion

Added a whole range of unique items and load outs to each entrepreneur alt-title.

Intending to give them some station location too.

* Completes outfit expansion
2024-04-21 21:12:12 +10:00
SatinIsleandGitHub c2263d59ee Ports "No Shoes" from RogueStar (#15893)
* Ports No Shoes from RogueStar

Added the ability to choose to spawn with no shoes in character setup. This was ported from RogueStar: https://github.com/TS-Rogue-Star/Rogue-Star/pull/196

* Small fix
2024-04-02 19:10:11 +10:00
SatinIsleandGitHub 7e1ca64167 Merge branch 'master' into entrepreneur-items 2024-03-23 00:29:58 +00:00
SatinIsle 01117743cb Fixed entrepreneurs losing their PDAs
Moves the ticket printer to the left hand, I forgot PDAs were a thing for a moment there.
2024-03-23 00:25:04 +00:00
SatinIsleandGitHub 0a611ae43c Climbing computers (#15855)
* entrepreneurs start with permission ticket printer

Added permission ticket printers to entrepreneur's starting loadout.

* Climb on computers

Added the ability to climb onto computers. Like a cat.
2024-03-22 03:29:05 +10:00
SatinIsle f51ccd91ad entrepreneurs start with permission ticket printer
Added permission ticket printers to entrepreneur's starting loadout.
2024-03-19 23:02:50 +00:00
Killian e50cbbe56e pda ringtone pref 2023-11-30 17:38:26 +00:00
Heroman ba7b9f46a6 Adds Entrepreneur job, as well as new Entertainer alt-title 2023-09-01 07:43:55 +10:00
Heroman 0131a9169c Fixes critical inventory equipment bug 2022-12-24 14:45:09 +10:00
Heroman e70731d417 ALL runtimes
ALL runtimes
2022-06-23 18:48:28 +10:00
PandoraandGitHub 69f69b5fe0 Update outfit.dm 2022-03-20 17:00:15 +00:00
PandoraandGitHub a965332861 I'm going to find out if I'm really alive 2022-03-13 08:55:09 +00:00
klaasjared 8a5afc9d6f Small Fix 2022-02-17 21:04:05 -05:00
klaasjared 2c312f71a0 Ruin Marine 2022-02-17 21:04:05 -05:00
klaasjared e8e7bf3990 Toy Guns
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
Aronai SieyesandGitHub cc609bdde4 Merge pull request #11589 from VOREStation/upstream-merge-8293
[MIRROR] Adds multitools to roboticist/engi toolbelts
2021-10-24 20:04:46 -04:00
Ghost ActualandGitHub 0085a5bd10 Adds more clothing from Polaris and various sources (#11546)
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdca.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
MistakeNot4892andVirgoBot 0386f03c57 Merge pull request #8293 from Schnayy/toolbelt-change
Adds multitools to roboticist/engi toolbelts
2021-09-12 20:16:05 -04:00
Ghost ActualandGitHub 4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
klaasjared 14b342c8c7 Base Commit 2021-08-19 13:15:20 -04:00
AtermoneraandVirgoBot 464cada77c Merge pull request #8183 from Cerebulon/hopid
Fixes blank ID sprite for HoP/Secretary
2021-07-25 05:00:46 -04:00
Aronai Sieyes 421228916e Port lots of new clothes!!! AAAA 2021-07-12 19:05:52 -04:00
Aronai Sieyes 414e8c97a3 Add sports bags to outfits 2021-06-28 17:00:41 -04:00
Aronai Sieyes 85c31e9fda WIP fix of this PR 2021-06-21 19:29:43 -04:00