Commit Graph

5022 Commits

Author SHA1 Message Date
Atermonera da338cc94d Merge pull request #5134 from Lorwp/pilotfallback
Actually adds adhoc_fallback to pilot headsets
2018-04-02 23:51:41 -07:00
atermonera d1db08ffeb Updates changelog 2018-04-01 15:13:50 -07:00
Mechoid 739bbd6e2b Merge pull request #5073 from mistyLuminescence/wallets
Wallet Expansion!
2018-04-01 15:01:05 -07:00
Woodratt 266b25232d Map fixes and tweaks
- Flashers in brig cells now should work, extra floor flash in communal brig to deal with crims.
- Inproper access, SMES rooms.
- Trader start point being dark now fixed.
- Medical Vendor Plus has more advanced burn and trauma kits. Also splints.
- Cell 1 and 2 in the brig can now be accessed by detectives.
- Additional r-walls next to the engine room to help with rads.
- Floor decals in a couple areas.
- RD office now has its telescreen back.
2018-03-31 22:33:11 -07:00
Lorwp 12bf2d1bf7 Actually adds adhoc_fallback to pilot headsets 2018-04-01 15:04:25 +10: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
Anewbe 6caa8e08cf Merge pull request #5113 from Woodratt/03262018_44revolver
44 revolvers
2018-03-30 17:46:37 -05:00
Atermonera 4b5fdb9825 Merge pull request #5076 from Anewbe/advanced_medkits
MDs and EMTs spawn with the white medkit
2018-03-29 16:31:10 -07:00
Anewbe 92df13c8c1 Merge pull request #5098 from Woodratt/03232018_randomaddsntweaks
Changes to objects random
2018-03-29 12:37:14 -05: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
Woodratt 32860140b4 44 revolvers
Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.
2018-03-26 14:33:43 -07:00
Woodratt fe28a50574 Changes to objects random
- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools
2018-03-23 23:03:15 -07: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
Billy Bangles 05fd53ebcc adds permanent markers
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
Anewbe d0bb030670 MDs and EMTs spawn with the white medkit 2018-03-19 17:34:43 -05:00
Heroman3003 c8326c290c Fixes for gripper interaction with frame parts and mecha equipment (#5025)
* possible fix

* truly a fix

* return of the lost comment

* and lost slash too

* stray not-my comment deleted

* added proper changelog

* replaced << with to_chat()
2018-03-19 11:50:05 -07:00
mistyLuminescence d644104f05 actually puts my name in the changelog 2018-03-17 21:20:19 +00:00
mistyLuminescence 49f2a3281c changelog 2018-03-17 21:13:47 +00: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
atermonera 4164a31fe1 Updates changelog 2018-03-15 19:22:07 -07:00
Nerezza 6822feb26e Attaches Tajaran tails to 3 more station rigsuits (#5023)
* Attaches Tajaran tails to 3 more station rigsuits

Adds cat tails to RD, EVA, and Industrial suits

* Minor tweak to north-facing sprites

The bend in the tails are a little nicer on the eyes now.
2018-03-13 16:48:37 -05:00
Anewbe 2e248b9160 Merge pull request #5046 from Woodratt/03102018_gunsnholoroses
Munitions/Security Supplypack touchy
2018-03-12 00:05:40 -05:00
Woodratt 98c081722e Munitions/Security Supplypack touchy
- Added, weapons crate for explorers that has bolt action rifles, weapon powercell crate (security access only).
- Touchy of all the munition and security supply pack names so it's easier to tell what crate contains weapons, armor, and or gear.
- Slight adjustment of certain security and weapon crates. Moving some guns out of some crates, splitting some crates up (automatic weapons crate is two crates now) and changing the type of crate stuff comes in.
- Holoplant fix, now properly comes in a crate instead of being shipped without a protective box.
2018-03-11 15:26:32 -07:00
Cerebulon b7090d7df2 Adds Tajaran Akhani language. (#5032)
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
2018-03-11 16:55:08 -05:00
Mechoid 06eb3e5e47 Merge pull request #5018 from Anewbe/syringe
Syringe adjustments
2018-03-10 13:28:00 -08:00
Anewbe f2da429eab Merge pull request #4980 from MisterLayne/ED_CLN
Adds the ED-CLN
2018-03-10 15:04:07 -06:00
Layne acdde85f4d Reinforced snowball fix. (#4991)
* temp snowball fix

* Create MisterLayne - SnowballTEMPFIX

* Update and rename MisterLayne - SnowballTEMPFIX to MisterLayne - SnowballTEMPFIX.yml
2018-03-10 14:58:25 -06:00
Anewbe 940557ee34 Merge pull request #5021 from Nerezza/Hardsuit-fixes
Misc rig fixes/tweaks
2018-03-10 14:57:37 -06:00
Nerezza 98711361db Fixes #5042
Renames the double-stacked icon from 'tile-sifwood' to 'tile-sifwood_2'
2018-03-09 16:19:41 -06:00
Anewbe 7ed36f51f2 Syringe adjustments 2018-03-07 18:46:50 -06:00
Nerezza a3228cd0c5 Makes slightly smaller objects capable of bashing open busted APCs (#5015)
* Makes slightly smaller objects capable of bashing open busted APCs

Because I've realized that engineers have enough --- to deal with without having to hunt down a fire extinguisher to bash open an APC

* Grammaring the best
2018-03-07 18:07:20 -06:00
MisterLayne 21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Anewbe 5e9cf9df06 Merge pull request #5019 from Atermonera/changelog1
Changelog Update
2018-03-06 15:48:50 -06:00
Atermonera 82a38c7ff6 Merge pull request #5011 from Anewbe/metabolism
Ingested reagents act half as quickly, rather than half as well
2018-03-06 13:07:17 -08:00
Anewbe 14f48b84cd VeyMed limbs (and organs) are now more vulnerable to EMP (#4987)
* VeyMed limbs (and organs) are now more vulnerable to EMP

* Changelog
2018-03-06 13:02:06 -08:00
Atermonera 982840c14c Merge pull request #4943 from Anewbe/robosparks
Robolimbs require repair at 30 composite damage
2018-03-06 13:01:39 -08:00
Nerezza 9d7f7a7e5e Misc rig fixes/tweaks
EVA suit no longer stores toolboxes because those use a volume inventory.

CE's suit no longer holds pickaxes and ore satchels, but can now hold inflatables.

Adjusted get_breath_from_internal() proc to disable rig internals if the helmet is retracted and no suitable mask is in place.

Adjusted the internals button to ignore offline rigs.
2018-03-06 13:49:14 -06:00
atermonera e6f5f2264c Changelog Update 2018-03-05 22:00:06 -08:00
Atermonera 81e5ea9536 Ater poi3 (#4968)
* Supply Drop POI

* Ration Cache

* BlastMine1

* Supply Drop 2

* Tweaks, package bomb detonators can be re-used

* Changelog

* Missed some spots while cherry-picking

* Merge branch master (I hope this works)

* Appeases travis

* Missed a spot
2018-03-05 19:55:27 -06:00
Mechoid 437aad2d77 Adds a Frankenstein Surgical Procedure (#4990)
* Makes a Surgery for Frankensteining

* Fix a thing.

* Tweak things!

* Sickness not permanent, Recovery is.
2018-03-05 19:46:05 -06:00
Anewbe 2d452be603 Ingested reagents act half as quickly, rather than half as well 2018-03-05 19:40:29 -06:00
Atermonera b4e7acc727 Merge pull request #4988 from Anewbe/alt_titles_part_one
Removes some alt-titles with insufficiently clear roles
2018-03-04 14:33:09 -08:00
Anewbe 24e22f86ab Merge pull request #4906 from PrismaticGynoid/acceptyourfate
Succumb changes
2018-03-04 16:03:40 -06:00
Anewbe 05d7697469 Removes some alt-titles with insufficiently clear roles 2018-03-04 13:56:14 -06:00
Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
Anewbe 524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
atermonera d686009233 Updates changelog 2018-02-28 12:29:27 -08:00
BillyBangles 2ab9bfe79b Turns the station into 420-station 13. (#4971)
* adds rolling paper and joints

F O U R T W E N T Y   B L A Z E   I T

* adds joint sprites

(they're pretty bad though)

* adds rolling paper box, adds papers to cig vendors

* c h a n g e l o g

smoke
weed
every
day
2018-02-28 14:16:42 -06:00
Anewbe 65d3a6f199 Merge pull request #4976 from Woodratt/02262018_thenorth
Wilderness Overhaul
2018-02-28 11:18:10 -06:00
Arokha Sieyes 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00