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
Cameron!
b44d87b744
Gives clotting kits a unique sprite
...
Adds a unique sprite for clotting kits
2018-06-27 11:08:15 -04:00
Cameron!
89dcfa7c52
Updates first aid kit sprites
...
So pretty.
2018-06-27 10:50:56 -04:00
Sharkmare
2cbfb05a4a
Making Circuit debugger fit in toolbelt
...
Because both the multitool and the Circuit wirer fit in already.
2018-06-20 03:39:09 +02:00
Atermonera
190dd08fc4
Merge pull request #5323 from Anewbe/loadsamoney
...
Wallet money spawns as a bundle.
2018-06-06 19:08:31 -04:00
Anewbe
237db1e90e
Wallet money spawns as a bundle.
2018-06-02 16:16:54 -05:00
Novacat
5addac95ed
Pathfinder Update ( #3777 )
...
* Pathfinder Update
- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker
* Polaris Merge Compatability
* Forgot some things
* Moves PF from command to science
* Requested changes Part 1
* Travis and Access Fix
* Requested changes Part 2
* Resetting Maps Part 1
* Resetting Maps Part 2
* Replaces PF office airlock
* Requested Changes Part 3
* Remove gateway access
* Changes Locker/Door Access Req
* Removes blast doors
* Pilot voidsuit crate cost tweak
2018-05-31 16:57:40 -04:00
Arokha Sieyes
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
Leshana
33202c5c38
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/giant_spider.dm
# html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
Neerti
cd2a538526
Merge pull request #5207 from Novacat/bluespace_duffle
...
Dufflebag of Holding
2018-05-02 22:41:27 -04:00
Atermonera
b75b3c539e
Merge pull request #5226 from Lorwp/drillmeta
...
Destroys Drill meta 2: Electric Boogaloo
2018-05-01 12:38:19 -07:00
Lorwp
1120e53d36
Destroys Drill meta
...
Makes screwdriver hand drills not fit in places a normal screwdriver can
2018-04-28 20:05:19 +10:00
Arokha Sieyes
1d0aeb95bd
Increase zealousness of Portable Freezer item whitelist
2018-04-27 20:16:57 -04:00
Arokha Sieyes
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# 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-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
Unknown
906db88b6a
Dufflebag of Holding
...
Adds a dufflebag of holding, essentially a bag of holding reskin that functions exactly identical
2018-04-24 02:09:39 -04:00
Heroman3003
32daa7a0d2
Fixed sheet snatcher spawning stacks with wrong looking icon
2018-04-12 21:55:24 +10:00
Verkister
90175bb1aa
adds proper bags
2018-04-12 09:26:02 +03:00
Verkister
9f21628619
Adds deer taur.
...
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
2018-04-11 17:14:21 +03:00
Leshana
e08cbef044
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
...
# Conflicts:
# code/modules/economy/lorenews.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
Atermonera
b63acc083d
Merge pull request #5143 from VOREStation/fix-usr
...
Reverted use of 'usr' back to 'user' from commit 05fd53e
2018-04-04 17:35:33 -07:00
Atermonera
a059ed0de3
Merge pull request #5133 from Cameron653/patch-1
...
Syndicate Dufflebag Tweak
2018-04-02 23:51:21 -07:00
Leshana
1f4bdc4389
Reverted use of 'usr' back to 'user' from commit 05fd53ebcc
2018-04-01 22:03:10 -04:00
Mechoid
739bbd6e2b
Merge pull request #5073 from mistyLuminescence/wallets
...
Wallet Expansion!
2018-04-01 15:01:05 -07:00
Cameron653
4a1ef0dbd6
Makes syndie dufflebags hint that they let you move faster
2018-03-31 11:02:01 -04:00
Leshana
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
mistyLuminescence
dfc0dd48bc
Removes vials
2018-03-30 02:12:58 +01:00
Atermonera
6adbe5537e
Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
...
Adds permanent markers
2018-03-28 11:49:10 -07:00
Arokha Sieyes
29eb468ef5
POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles
2018-03-25 17:05:20 -04:00
Cameron653
59844c5553
Xenoarch Multitool & Xenoarch Excavation Drill ( #5058 )
...
* Xenoarch Multitool & Xenoarch Excavation Drill
* Makes the tool work better
* Cuts down on lines & left comments
* change to m
2018-03-22 09:50:50 -07:00
Arokha Sieyes
3cc7138ca3
POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles
2018-03-20 19:01:36 -04:00
Billy Bangles
d953a58413
travis pls
...
why must we argue so
2018-03-19 21:23:48 -04:00
Billy Bangles
05fd53ebcc
adds permanent markers
...
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
mistyLuminescence
8769f4605a
trims list
2018-03-18 03:20:36 +00:00
mistyLuminescence
70f7ef7d6f
Wallet expansion!
2018-03-17 21:10:23 +00:00
Anewbe
d36e67d90d
Merge pull request #5064 from VOREStation/vs-port-3142
...
[PORT] Improved playsound and drop_location() from /tg
2018-03-17 15:01:07 -05:00
Atermonera
4fa4173e29
Merge pull request #5049 from Anewbe/quickdraw_items
...
Ports quickdraw storage items from VIRGO
2018-03-16 11:37:58 -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
