Novacat
9079cdd276
Merge branch 'master' into upstream-merge-5972
2019-03-28 20:50:10 -04:00
Neerti
15e3c04ca3
Nock masks, cowls & robes
2019-03-28 20:42:42 -04:00
elgeonmb
9d056decda
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
Atermonera
20604f2952
Merge pull request #5841 from Anewbe/voice_changer
...
Voice changer tweaks and fixes
2019-03-27 18:57:49 -04:00
Anewbe
f169a5f8bf
fixes zaddat mask problem
2019-02-19 22:52:18 -05: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
8c5562b4bc
Fixes some bugs tangentially related to Vox code
2018-09-04 21:36:12 -05:00
Anewbe
08ddd217a8
Buffs the Vox
2018-08-31 22:58:25 -05:00
Anewbe
4d696241fa
Merge pull request #5349 from Woodratt/WR6112018_clothingfix
...
Clothing Bug Fixes
2018-06-14 10:54:14 -04:00
Woodratt
344cb191a5
Clothing Bug Fixes
...
- Fix for duster on mob sprite
- Fix for striped swimsuit the on mob sprite
- Fix for hairpin on mob sprites
- Moved Riot and EMT spacesuit sprites to the proper dmi
- Moved combat rig sprite to the proper dmi
- Added a new gasmask (ported from Vorestation). Gasmask with a clear faceplate. Not added anywhere in the playing field
- Radiation hood now will not have hair clip through
2018-06-11 15:22:13 -07:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
Leshana
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
Anewbe
0261cc4771
Explorer gasmasks can be equipped through their hoods ( #4867 )
2018-02-20 12:36:05 -08:00
Arokha Sieyes
cdd2030811
POLARIS: Ports Bay's wall-mounted air pumps
2018-02-18 13:24:23 -06:00
Arokha Sieyes
33539aa0f4
POLARIS: Ports Bay oxygen/anesthetic pumps
2018-02-18 13:14:57 -06:00
Leshana
3c3dac7102
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
...
# Conflicts:
# code/_onclick/hud/hud.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-19 17:52:25 -05:00
Billy Bangles
1ef0a7c3d4
adds 4 new spooky masks
2018-01-18 16:52:24 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Neerti
8ac2100fa2
Adds Exploration Equipment
...
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
killer653
0080539924
More fixes
2017-10-15 19:54:50 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Spades
e2941dfb5a
Fixes some badly done vorestation edits in gasmasks
...
also adds my new gas masks
2017-09-02 04:07:51 -04:00
Spades
5bbf24a386
Fixes "Death Commando" mask, changes its name
...
No use letting unused assets go to waste.
At first I thought this was a redundant mask but it actually serves a
use, it's just coded wrongly.
2017-09-01 20:09:31 -04:00
Arokha Sieyes
e369536e44
Use Dhae's Gas Masks
2017-05-20 01:05:12 -04:00
Leshana
9a894008d6
Change standard gas masks to not hide face.
...
* Old gas masks still hide them just the same
2017-05-14 22:31:41 -04:00
Arokha Sieyes
80670b420c
Merge current master in
2017-04-25 20:14:38 -04:00
Arokha Sieyes
fd8a382dfb
Eris Gas Mask Sprites
2017-04-23 17:33:51 -04:00
Cerebulon
fc974f1dd9
Removed missed bit of sprite code in luchador masks.
2017-04-19 23:55:12 +01:00
Cerebulon
15cac2752b
Moved spritesheet code to base mask item. Fixed captain's helmet. Cleaned up all duplicate/misnamed rig helmets.
2017-04-19 23:52:52 +01:00
Cerebulon
dd3ed474fe
Added code for effected mask sprites, fixed remainder of mask sprites.
2017-04-19 04:31:25 +01:00
Anewbe
81c8570ba8
Merge pull request #2904 from Anewbe/theUnboxingBegins
...
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe
c805befca6
Breath mask action button
2017-01-16 18:14:35 -06:00
Anewbe
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
MagmaRam
8dae3942f0
Merge pull request #2719 from Anewbe/half_gas
...
Ports bay's half gasmak
2016-11-12 21:44:24 -06:00
Arokha Sieyes
5a5a50f7b0
Improves bandanas
...
No more tie verb. Just put it into whatever slot and it (correctly) adjusts the needed stuff to work. Added 'Can be worn on the head or face' to the description to indicate that.
Currently wearing a bandana on your head makes it impossible to eat, which doesn't make sense, so this fixes that too.
2016-11-11 10:51:35 -05:00
Anewbe
cc2d9d9528
Ports bay's half gasmak
2016-11-10 23:08:29 -06:00
redstryker
c8bf4cfce2
Changelog and Inventory Flags
2016-11-05 18:12:11 -04:00
redstryker
87d7d05048
Guy Fawkes Mask
2016-11-05 18:07:29 -04:00
Anewbe
b9d0cfd7b6
Display monitors will show faces again.
2016-09-26 21:25:08 -05:00
Neerti
828dacf485
Centralizes weight class definitions
...
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
SinTwo
b4bb348e01
clothing mob sprites fix
2016-07-23 23:49:57 -04:00
SinTwo
7192bf08fd
item_state cleanup
2016-07-11 22:31:32 -04:00
redstryker
1dcad7f92d
Adds the Ability to Pull Down Sterile Masks and Wear Bandanas on the Head
2016-07-04 19:31:15 -04:00
KasparoVy
d5aabda108
Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers ( #1775 )
...
* Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers
As requested!
* Modified as requested.
* Different Names
2016-05-29 15:09:56 +01:00
Arokha Sieyes
ea6754597e
Ports Bay's Robolimb Changes ( #1779 )
...
* Consolidates copypasta for repairing robolimbs
Also prevents self-repairing a limb you are using to hold the tool
* Fixes robot organs becoming undamagable after reaching cap
* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck
* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123
* Fixes damage to robotic limbs not triggering organ processing
At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.
* Build on HarpyEagle changes to apply to Polaris
Had to apply the change from flag to an enumeration.
* Removes unneeded file
* Fix bruisepacks, remove heart
Well, the unused bay version of the heart anyway
* Tweaks examine, reverts isSynthetic
Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
fe9d3fd4c4
Merge pull request #1027 from Kelenius/mobCleanup
...
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
