Commit Graph

45 Commits

Author SHA1 Message Date
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Anewbe
7130d56b80 Merge pull request #3064 from Woodratt/WR_SC_Changes
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt
19fb047f01 WR_SC_Map_Changes
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Leshana
12ab0e4da2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 2017-03-06 22:46:28 -05:00
Leshana
a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Arokha Sieyes
85fbc527a3 Nearing playtest time 2017-02-13 20:24:54 -05:00
Anewbe
7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
woodratt
a3fc7dad15 1.6.2. Map Tweaks Random Loot lists yet another Armory Overhaul.
- Taken from Bay and edited a bit, maintenance now has a chance to have some randomized items in crates and on racks. Nothing extremely exciting or game changing should spawn yet, sadly. Probably still needs some adjustments and really needs some additions but works at this stage for live testing to see how badly RNG wants to spawn sin pockets and botany gloves.
- Minor map adjustments to both z-levels 1 and 2. Including things such as a mirror placed on the technomancer ship. Light adjustments on the main z-level. Removing redundant lightswitches, adding lightswitches, removing redundant newscasters. Fixing other old mapping errors.
- Largest chunk of change, rework of the armory. Image Link Two sets of all of the armor except for the riot armor has been removed from the armory. A 'tactical equipment' storage room has been readded (warden access) with the combat armor, lethal ammo, and two of both the energy weapons and ballistic guns moved to it. Four energy weapon power cells have also been added to said equipment room as well as one magazine of lethal 45 ammo (it was 5 magazines before, this makes it a even and less OCD annoying 6, like the rubber magazines).
- Practice ammo moved from the armory to the firing range on a conveniently empty table.
- Defib units now available in medical, and one in both first aid checkpoints.
2016-11-21 14:41:13 -08:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00
Anewbe
d76e4cd075 Flashlights use device cells 2016-10-16 13:30:38 -05:00
Spades
05869b0d9b Zoo.dmm added, Vault updated, various bugfixes (#634)
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb211759604a95319ce6b1c74219a4b60800.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
2016-10-09 18:55:17 -04:00
Spades
76e2fa3184 Contraband updated (#618)
Battle rifle and other non-contraband removed.
Added various new contraband to the list.
2016-10-01 22:25:12 -04:00
Spades
e8b112fdc1 Contraband Update (#564) 2016-09-18 23:17:55 -04:00
Spades
7e84419866 September Polaris Sync (#545)
* Removes Captain as a title, sets default to Station Administrator, and adds a new title, Site Manager

* Fix atmo_control interface temperature reading

* Adds Multiple Alternative Titles

* Removed Supply Assistant

* Removed Sergeant

* Removed Computer Scientist

* Revert "Revert "Frame Cleanup""

This reverts commit 82722ba42f.

* Changed Supply Officer to Requisitions Officer

* Changed Requisitions Officer to Supply Chief and Removed Courier

* Removed Life Support Technician

* Removed Brig Officer

* Tweaks the lowest level of heat damage to be less insane

* Corrects damage amount for heat_damage_level_1

* Maybe Perhaps Last Major Technomancer PR
Adds ability to sort the spells section of the catalog into categories.  The categories available are 'All', 'Offensive', 'Defensive', 'Utility', and 'Support'.
Removes preset section on catalog as it was unused.
Projectile spells now have a sound when fired.
Haste lasts five seconds instead of three.
Repel Missiles lasts for five minutes instead of two.
All healing spells work five times as fast, healing in five seconds instead of twenty five seconds.  The amount of instability and healing done has been multiplied to remain consistent.
Passwall can now be used on more than just walls, if there's something dense on the same tile.
Force Missile is now 25% cheaper to cast, and has a cooldown of .5 seconds instead of one second, and does 5 more damage.
Beam's damage is increased by 10, and energy cost decreased by 25%.
Lightning's warm-up time is now one second instead of two.
Overload now costs 10% of total energy instead of 15%, and damage scaled with 4% of their current energy reserves, and 5% with the Scepter, instead of 3%/4%.  Additionally, instability per shot is lowered to 12 from 15.
Track now costs 25 points instead of 30 in the catalog, because roundness.
Fire Aura should look more impressive without a Scepter.
Fixes bug where shooting Lightning made you motionless for twenty seconds.

* Adds Multiple New Clothing Items

* Makes Loincloths only Availiable to Taj and Unathi

* Tweaks the contents of the captain's closet

* Smokables now give an approximation of how much longer they'll burn once lit

* make teshari not bad to play

* Tea Tweaks

- Minor changes to the color of some of the drinks such as tea and iced tea. Still not happy with the colors, but they seem better than before.
- Modification to the British cup sprite.
- Addition of a tea sprite for the coffee cups.

* fixes exception handling runtiming

* Adds missing error handler that made it difficult to debug runtimes.

* Corrects error handling proc

* Adds missing runtime viewer Topic calls.

Relocates them to the datum itself rather than it being an admin topic for maximum self-containment.
Also adds 'adminplayerobservefollow', making it possible for admins to not only jump to mobs but also follow them with a single click.
Misc tweaks from Paradise.

* gib population

* Adds the ash() mob proc, preps ninja suit

* Fixes #2352

* Changelog

* alt title

* Rigs now have suit coolers

* Map edit

- Fixes lighting in Security. Again.
- Fixes lighting in Library.
- Adds a new maint tunnel between engineering solars and atmos, now
outside the blast radius of SME explosions.

* Almost forgot emergency shutters.

* Examine Cigarette Lore

* Fixes Capitalization

* Eliminates colon

* Should clear up the usr issue

* Fixes cryopods of all types not setting occupant correctly.

* updates changelog

* Fixes runtime that occured if someone touched a blast door with an empty hand.

* Fixes check_rights() runtime.

* Adds magboots to ling spacesuits

* Adds Changelog

* Turret Fix
Turrets can now deploy properly and not be stuck in a state of deploying forever if a target is in range.

* Revert "Adds hub passwordu"

* Makes changeling recursive enhancement a passive power

* Corrects a description

* Adss changelog

* Add files via upload

* Changeling/Wizard/Future Stuff Hud Button Fix
Hopefully this stops the roundstop changeling hud wonkiness.

* Changes Mining Hardsuit slowdown to 1, from 3

* Widened hallway

* Speeds up arm_guard and leg_guard wearers slightly

* Forgot to use map cleanup tool.

* Adds changelog

* Adds changelog

* Minor Emitter Tweaks
Emitters no longer die by shooting a taser or laser tag gun at it.
Emitters don't explode if they are not on a powered wire with sufficient electricity in it.  They will just crumple away instead if integrity is reduced to zero.
Taking any damage to the emitter no longer results in instant death due to me being an idiot awhile ago.
Emitters can be examined to see if they are damaged, and can be repaired by applying metal sheets to it.

* Github, stop being stupid!

* Tweaks Sec Voidsuit values

* Fixes external airlocks

* Elevator-MMI fix

* Shoveling Snow

* Laptop ID Computer Fix
The manifest should now be updated correctly when using laptops.

* do_after is more immersive

* Fixes second bug involving inability to change title to station admin.

* Adds more unathi hair and facial options

* Adds the changelog

* Retweaks secret player requirements

* Updates changelog

* Fixes sprite not updating to not be floating when leaving non-gravity

* Adds changelog

* Fixes changeling revive not working when you're missing a limb

* Fixes #860

* Adds changelog

* Makes flash confused duration the same length as the flash blurry eyes

* Increases the change of lung rupturing

* Adds vomit as an emote

* Adds changelog

* Removes revolution shuttle delay

* Adds changelog

* Projectile flash rounds will now do the same as a flash when hitting a target

* Adds changelog

* Fixes dna-lockable gun explosion security level

* Drink Container Lore

* Decapitalizes 'Sleeper'  Because Why

* Fixes Grammatical/Flow/Sarcasm Errors

* Completes dna lockable guns implementation by adding a dna chip that can be added to guns

* Fixes + forgotten file

* Moves DNA locking stuff down to the item level rather than gun, also adds the ability to emag to remove the lock

* Adds changelog

* Adds the ability to wear ponchos as an accessory, also adds the ability to have ponchos as a suit accessory

* Adds changelog

* Closes 2 missing spans

* Adds secure briefcase to custom loadout

* Adds changelog

* Headgear Additions, and an Undershirt

* Medical splint buff and new ghetto splints.
Adds hands and feet to splint-splintable organs.
Also adds ghetto splints that can't do hands and feet.

* Fixed Sleeper... Again

* Renames "poncho" slot to "over"

* Speeds Hyperzine metabolism

* 1.5.8 Map bug fixes
-Fixed brit cup sprite.
- Replaced a maintenance door leading into atmospherics with one with the proper access.
- Fixed Missing Disposals pipe next to atmos.
- Tweaked some light placement in the main hallways.
- AI core redesign.
- Turned off medbay lobby intercom.
- Cyborg charging station added to prison wing.
- Cyborg charging station added to the research outpost.
- Medical rig suit added to medical.
- EVA rig suit for engineering added to EVA.
- Second  residential elevator installed. Due to budget cuts the size of the elevators has been reduced.

* Updates changelog

* Sombrero Code

* Fixes #2365

* Adds changelog

* Sleeper is evil.

* no message

* Changelog

* Stops observers from leaving prints on the ground.

No more spooking the mortals, ghosts.

* Allows autotraitor in secret to start with 0 players

* Adds changelog

* Makes diona slightly less slow

* Adds changelog

* Bowling Shirts

* Updates changelog

* Adds a missing description

* Flat Cap Changes and Hair Bow

* Fixed Error

* Adds an in-hand

* Lower Torso cannot be amputated

* Smoke works, adds changelog

* Updates changelog

* Makes Unathi Voidsuits Less Fat

* Medical related fixes

* Fuzzy Cuffs

* Tube Top

* Made Icons for Security Suit Less Gaunt

* Revert "Medical related fixes"

This reverts commit d7c59520e6.

* Just the fix to random med item now

* Fixes Evening Glove Coloring

* HAZMAT Suits

* Changes Unathi sprite slightly

* Tweaks skirt pathing

* Corrects changelog

* Adds changelog

* Construction Voidsuits

* makes people bleed real good

* adderino changeling

* Revert "Revert "Adds hub passwordu""

* Explosive implants should no longer gib on limbs.

* I still have no idea what I am doing.

* Resolves #331
2016-09-11 19:52:40 -04:00
Spades
50140d6ad6 Just the fix to random med item now 2016-09-04 17:32:21 -04:00
Spades
a0cc7c1050 Revert "Medical related fixes"
This reverts commit d7c59520e6.
2016-09-04 17:31:48 -04:00
Spades
d7c59520e6 Medical related fixes 2016-09-03 14:02:29 -04:00
Yoshax
ecb2c9d5d7 Adds changelog 2016-07-12 20:33:55 +01:00
Yoshax
527b71335e Random item clean up, adjustment and addition 2016-07-12 19:55:10 +01:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Yoshax
1237d361a5 Adjusts random tech to spawn random cable instead of always red 2016-05-28 04:42:05 +01:00
Zuhayr
8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr
4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
Raptor1628
cf0e526d91 Fixes and adjustments
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00
MrSnapwalk
f4f54dfed1 Fixes action figures not randomizing properly. 2015-02-25 21:52:36 -06:00
Raptor1628
d4870b80ee Assorted Fixes
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
2015-02-24 14:40:02 -05:00
MrSnapwalk
71f8a5c8e8 Minor fixes, action figure refactor. 2015-02-19 20:37:36 -06:00
MrSnapwalk
cc0266c776 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moretoys
Conflicts:
	code/game/objects/random/random.dm
2015-02-18 19:02:23 -06:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
MrSnapwalk
52072bc7cf Adds action figures, large and small plushies, and the toy cult sword. Adds all new toys to the arcade machine. 2015-02-17 20:38:13 -06:00
Skully71
3d2abddaa7 Add random single object to enable a given object to be spawned at chance 2015-02-04 10:41:47 +01:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Amunak
edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
mwerezak
d506eca89a Adds tape rolls to the tool storage spawner list 2014-12-08 00:15:27 -05:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
Jarcolr
522bebb197 Fixes #4721
Also added the multitool to bomb supply storage.
2014-04-12 13:06:10 +03:00
jack-fractal
e3fd232741 - removing yellow and black gloves from the randomized tech storage object
- adding toolbelts
- rebuilding changes to map
2013-06-11 00:52:32 -04:00
jack-fractal
23498c269a - adding random objects
- randomizing main tool storage starting objects

- randomizing secondary tool storage starting objects
2013-06-09 18:12:57 -04:00