Commit Graph

151 Commits

Author SHA1 Message Date
Cameron Lennox 13994707dc Fixes stasis bags from killing (#19349)
im DUMB

wtf

Update life.dm

Makes resurrection artifact not as jank

Allow fossil bags on belts
2026-03-28 20:44:09 +01:00
Guti 7018074d55 Anomaly Harvesting (#19068)
* Automatic changelog compile [ci skip]

* Anomalisci

* TGUI stuffs

* Fimx

* Colours

* Little polish

* Remove mult

* .

* Anomaly harvester

* Particle gun

* Dangerous anomalies

* Emitter update

* Suspension generator

* Flux & Weather update

* Techweb + Mapping

* Fixup maps in TGM format

5cff3b2d1d: maps/tether/tether-01-surface1.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* fimx

* Oops that wasn't updated

* I swear I got it this time

* Adjustments

* Dust anomaly

* Couple of fixes

* Borg stuff

* Scanner module

* Fix attempt

* Boxless

* Fix (Hopefully)

* Changes

* .

* fix ranges

* fix the harvester UI

* wrong typing

* dm icon handles icon sizes internally

* stack gap handles that

* .

* .

* .

* fixes

* refs are unique keys

* release all

* .

* .

* Change

* Grip those samples!

---------

Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-03-11 21:17:52 +01:00
Will 009193bb69 Chemical engineer alt-title (#18829)
* job requirement stuff

* job hud icon

* small fixes

* no change plz
2025-11-27 21:27:53 -05:00
Guti fabf8b606b Belt holders (#18535) 2025-09-18 20:00:36 -04:00
Cameron Lennox 1fb55f0353 Misc QoL tweaks (#18271)
* Explorer belt can hold binoculars

* Allows chem bags to hold autoinjectors and be on belt

* Adds some more to belt

* comment
2025-08-20 00:24:01 +02:00
Killian f6fe07eac8 clothing _vr dmi cleanup: backpacks, bags, and belts (#18232)
* _vr dmi cleanup: backpacks, bags, and belts

* _vr dmi cleanup: backpacks, bags, and belts

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-08-16 13:21:11 -04:00
Will adde40854a Gene Scanner Tool (#17733)
* Gene scanner

* loot and lathe for gene scanner

* show suppressed genes
2025-05-24 18:58:14 -04:00
Cameron Lennox f40bf1f7e4 Vendor and Phasegun adjustments (#17647)
* part 1

* Cleanup

* text

* webbing

* Eh these values seem fine

* Bonus damage to mobs

* if we have a mind, dont take bonus damage

* Less VR overrides

* vendr
2025-05-15 20:14:05 -07:00
Guti 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
Kashargul c30f2b9c49 next grep, no spaces (#17437)
* next grep, no spaces

* next few files

* fix that

* fix that
2025-03-28 21:25:08 +01:00
Guti 9077c940c4 Better Viro (#16536)
* Better Viro

* Quarantine ship

* Lazy...

* Roanoake prep

* Roanoake

* Verbs

* Verbs + Logging

* Virus breath check
2024-11-05 12:40:02 +01:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Guti f2d6e7c639 Damn recording tapes 2024-09-29 00:14:13 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
Nadyr 06c5c8cee4 Update belt.dm
removes duplicate syringe case
2024-09-03 17:10:38 -04:00
Nadyr eff6c5749c September 2024 adds, QoL and fixes 2024-09-02 23:12:15 -04:00
Heroman3003 bf490b78ac Adds Contaminant Detector HUD (#15970) 2024-05-09 19:37:19 +10:00
Drathek 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
Heroman b255b1a8a3 Fixes belts and pouches not being able to hold power tools 2023-10-02 15:54:41 +10:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
VerySoft 5e4770e3a5 Ticket printer in belt
belt
2022-11-21 20:45:10 -05:00
Heroman3003 bc4b9ce9dc Fix 2022-10-29 17:16:00 +10:00
Heroman3003 107b75b050 Conflict resolution 2022-10-29 17:11:37 +10:00
Atermonera e70d5b7986 Adds flasks to the forensic belt allowed items 2022-10-28 19:41:39 -04:00
Pandora 82ec1cc013 Oops, all indents 2022-10-18 19:25:49 +01:00
Pandora e550958411 Update belt.dm 2022-10-18 19:17:07 +01:00
Heroman 7c4572e339 Fixes issues with taurs and belts/suits. Again 2022-06-25 08:03:18 +10:00
Pandora ead95082d3 Atmos Tech QoL 2022-03-06 06:00:36 +00:00
klaasjared e8e7bf3990 Toy Guns
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
PastelPrinceDan 7657901241 okay let's hope this works now 2021-12-22 15:11:09 +00:00
Hatterhat 92cff738e7 hhhhhhhinducer 2021-12-15 23:42:33 -06:00
Hatterhat 735d70f728 booster gaming 2021-11-15 20:25:06 -06:00
Aronai Sieyes 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 Actual 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
MistakeNot4892 0386f03c57 Merge pull request #8293 from Schnayy/toolbelt-change
Adds multitools to roboticist/engi toolbelts
2021-09-12 20:16:05 -04:00
PastelPrinceDan 40e2d09429 belts woo yeah 2021-09-03 20:26:27 +01:00
Schnayy ceb4488540 Stun Revolver Update 2021-08-13 18:17:21 -04:00
Aronai Sieyes d7a32991eb Move like every clothing icon file 2021-07-09 18:13:28 -04:00
Neerti 767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
David Winters 0a5c5d974b nanopaste, spade, light replacer 2021-04-20 18:29:00 -04:00
Atermonera c586a83071 Repathed/renamed seromi to teshari. 2021-03-26 15:38:02 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera 55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 16:15:04 -05:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Cerebulon 6385a2f662 ERT Rangers Costumes (#6493)
* Sprites

* and code fuckit
2019-10-25 15:07:49 -04:00
Neerti 5ed3916de3 Merge pull request #6166 from Sebbe9123/fixholoprojectors
Lets sec people carry holoprojectors in their belts
2019-05-20 18:43:52 -04:00
Arokha Sieyes b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
2018-09-27 18:01:09 -04:00
Anewbe 7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe 729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00