Commit Graph

709 Commits

Author SHA1 Message Date
Unknown
a788cad3d9 Nerfs Chemistry Bag Toting
Chemistry bags can no longer be carried around in the belt slot, considering the number of chems they can carry they are probably a bit too large for that.
2019-11-17 15:55:19 -05:00
Meghan-Rossi
f8c214ea67 Fix box of service keys being called "box of command keys" 2019-11-12 08:55:43 +00:00
Cerebulon
6385a2f662 ERT Rangers Costumes (#6493)
* Sprites

* and code fuckit
2019-10-25 15:07:49 -04:00
Novacat
173fd85764 Merge pull request #6086 from Verkister/werespecies
Adds werebeast event species
2019-10-21 21:02:53 -04:00
Verkister
47d56f13d1 Adds werebeast event species
-Adds new customizable carbonspecies for werebeast shenanigans.
-Stats-wise somewhat faster, tougher, and hungrier compared to base humans. Also darksight.
-Added whatever the code needed to make it possible to have taller carbonspecies.
-As a side effect, the forementioned also makes it possible to do long necked species and more.
-The werebeast can use the tail, hair, ear, and markings customization. This will be messy on tails that rely heavily on human silhouette. The hair and ear customization is fully functional using unedited human assets with a coded offset.
-The hair/ears offset is a modifiable var for the species specific head organ subtype, and can be used by other species that use custom headtypes.
-The werebeast has a set of markings as well, restricted to the species. face, belly, socks, and nose.

Currently the werebeast ready clothing is limited to:
-Back: basic backpack, basic satchel, leather satchel, basic courier bag, and basic duffle.
-Belt: toolbelt and security belt.
-Eyes: most sunglasses and sunglass huds, welding goggles, regular and 3d glasses, plain, meson, and science goggles.
-Feet: black and brown basic shoes, galoshes, jackboots, and toeless jackboots.
-Hands: latex/white, nitrile, yellow/insulated, black, and fingerless gloves.
-Head: the entire selection of vanilla headgear.
-Suit: labcoat, regular and white hazard vest, and 4 flavors of varsity jackets.
-Uniform: white pants, white shorts, white, orange, yellow, black, grey, robo, engie, and janitor jumpsuits, swept and nurse skirt.
Everything else will likely not show up at all, but more can be added whenever needed.
2019-10-20 18:45:29 +03:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Novacat
ab256b75b3 Merge pull request #5846 from Novacat/nova-basicfixes
Shelter Capsule Improvements
2019-09-14 00:38:45 -04:00
Unknown
5e2abf9fd4 This is becoming a shelter capsule PR 2019-09-12 22:50:03 -04:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
Unknown
0d73c8ad76 Early Polaris Ports
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms
Adds worms
2019-06-11 17:35:11 -04:00
Atermonera
ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts
Makeover Kit
2019-05-28 13:10:09 -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
Unknown
07b866b2f8 Last Second Tweaks
- Swaps trash pile money breifcase with something more balanced.
- Adds emergency softsuit box to luxury capsules.
2019-05-03 16:32:21 -04:00
Unknown
27565f4da9 Boxed emergency suits 2019-05-03 03:06:00 -04:00
Unknown
68649aeb71 Recommended changes 2019-05-02 17:38:26 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Heroman
727ecd39a8 Removes glucose autoinjectors from vendomats 2019-04-21 16:06:49 +10:00
Atermonera
2869ad6f73 Merge pull request #6106 from chaoko99/Pullbox
ore bags will now automatically pick up ore and dump them into a box if one is being pulled.
2019-04-18 13:19:50 -04:00
Unknown
7ecddb11de Service Keys Too 2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Unknown
5ce5403b17 Apparently it exists and is in the wrong dmi 2019-03-30 00:52:46 -04:00
Unknown
42991bb551 Replaces clutch purse sprite
Sprite is temporary, but makes the item usable.
2019-03-30 00:19:09 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
abcde8fe5f Merge pull request #4680 from VOREStation/upstream-merge-5825
[MIRROR] Adds ability to put butts in boxes
2019-03-27 15:19:30 -04:00
Novacat
1bbb64494e Merge pull request #4678 from VOREStation/upstream-merge-5835
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
2019-03-27 15:19:15 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Anewbe
1ea5885504 Merge pull request #5825 from PolarisSS13/butt_boxing
Adds ability to put butts in boxes
2019-01-14 21:23:41 -05:00
Neerti
e1cf31c565 Merge pull request #5835 from Cerebulon/ReligionUpdate
Updates Religion Lists + Adds Religious Paraphernalia
2019-01-14 03:47:00 -05:00
Unknown
8fbd5a5d0a Adds Door Pry, to Ace's specifications 2018-11-24 16:23:17 -05:00
Unknown
26f0741a6f Adds Crowbars to Survival Boxes
Fixes #4505
2018-11-18 02:45:41 -05:00
Neerti
0e3a60e10c Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak
Biogenerator improvements.
2018-10-30 18:40:18 -04:00
Unknown
3f4039d027 ERT Equipment Redo
- Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles
- Adds 5mm Assault Rifles, .45 revolvers
- Reduces the number of powerful weapon types (energy sniper, combat shotgun)
- Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines
- Adds a lot of things to the medical and engineering ERT sections
- Replaces weapon power cells with self-charging weapon power cells
- Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells
- Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section
- Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy
- Adds LMGs to Zulu's armory
2018-10-10 19:02:48 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Arokha Sieyes
cb43ac69ea Satisfy stupid indentation.awk, which is just wrong. 2018-09-27 18:22:55 -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
Wickedtemp
21878523b1 Adds the Biopsy Scanner to the Surgery Kit (#5589)
* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.
2018-09-22 18:53:36 -05:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Mewchild
d01488a1cd Reverts Syringe infections 2018-08-13 10:53:02 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05: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
Atermonera
5a448d9cd5 Merge pull request #5387 from Hawk-v3/master
Chaplain PDA Bug Fix & Atmos Dedupe
2018-07-04 01:14:06 -04:00
Hawk_v3
3e1d73bbf1 Chaplain PDA Bug Fix & Atmos Dedupe
- Chaplain PDA bug: Caused by the chaplain custom preview calling equip. Disabling it seems to have no issues with the preview and stops it making a new PDA every time it generates a new preview.

- Atmos Tech Dedupe: All engineers start with a T-Ray in their right pocket. Atmos techs also had one in their toolbelts. And now the extra one in the toolbelts is gone.
2018-07-02 17:33:34 +01:00
Cameron!
f44fe108a1 in which we discover the importance of proper quotation
and apologize profusely to Travis for the inconvenience
2018-06-27 11:29:23 -04:00
Cameron!
66c8325e48 properly comments the clotting kit change 2018-06-27 11:09:44 -04:00