Anewbe
4130719b3b
Merge pull request #2683 from Yoshax/EfficientClosets
...
Adds subtype friendly method to populate crates.
2016-10-28 11:07:37 -05:00
Arokha Sieyes
c7291c315f
Allow wet 'downgrades' on turfs
...
Such as allowing you to get water on a floor with spacelube to replace the lube with normal water which will eventually dry. Otherwise there is literally no way to clean up space lube. Which is a little ~~fun~~ crazy.
2016-10-26 22:21:48 -04:00
PsiOmegaDelta
65b12a10f2
Adds subtype friendly method to populate crates.
2016-10-25 21:40:28 +01:00
Neerti
7dadc5f6f9
Merge pull request #2658 from Anewbe/waistcoat
...
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
Neerti
09030f8e8f
Merge pull request #2673 from Anewbe/cuff_port
...
Kills Telecuffs
2016-10-24 19:28:44 -04:00
Yoshax
8c68671b3b
Resolves an uplink issue
2016-10-24 23:11:55 +01:00
Anewbe
6d1d18a585
Kills telecuffs
2016-10-23 21:31:12 -05:00
Anewbe
b523406b27
Returns some functionality to the waistcoat, adds cham tie
2016-10-23 00:31:06 -05:00
Arokha Sieyes
aed841a97d
Adds for centcom jobs
...
... and me ;v
2016-10-22 18:35:13 -04:00
Neerti
8bf97faaef
Another Big Technomancer PR
...
See PR for details.
2016-10-22 11:51:12 -04:00
Arokha Sieyes
9e99bf12c3
Added one word
2016-10-21 01:04:31 -04:00
Arokha Sieyes
5de7a29ca4
Tweaks to restore a few VS things
2016-10-21 01:00:59 -04:00
Arokha Sieyes
cfff650f29
More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit
2016-10-21 00:18:46 -04: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
Arokha Sieyes
95a3c14925
This fixes a bunch of things so here's each file change and why:
...
global_lists_vr.dm - Removes generic 'suit' which included basically any outerwear, and the invisible magical storage/internal
storage/internal.dm - Don't name the storage inside suits the same as the suit. It causes weird name-alignment problems where if you delete the suit it might just delete the internal storage, or the other way around.
Dreaming.dm - Added some vorish stuff I made up.
belly_vr.dm - Fixes for digesting items and how that works, and how to prevent them from showing up on the HUD. Also fixes IDs falling onto the floor (among other things).
living_vr.dm - Just in case, adds null-entry cleanup to belly cleanup proc.
bellymodes_vr.dm - Removes previous null-item hotfix.
vorepanel_vr.dm - Adds zero-width space to make items in belly wrap and not look horrible.
skim.dmf - Adds Y hotkey for whisper, and 6 hotkey for subtle.
Closes #455
Closes #443
Closes #239
2016-10-20 16:34:34 -04:00
Anewbe
510cf17723
Waistcoats are accessories
2016-10-19 22:29:22 -05:00
Spades
2ea9555d86
Merge pull request #657 from Cameron653/master
...
Makes the server include advanced_who
2016-10-19 03:13:43 -04:00
Anewbe
0a8a7b6191
Ling stings and absorb are logged
2016-10-18 17:21:35 -05:00
Eearslya
334cb48dab
Force having OOC notes set to spawn
2016-10-17 23:25:07 -07:00
Neerti
e5f23056be
Merge pull request #2654 from Anewbe/tape_fix_again
...
Should fix the tape thing.
2016-10-17 22:36:00 -04:00
Anewbe
fa53b659a4
Should fix the tape thing.
2016-10-17 16:52:20 -05:00
Cameron653
75ac0f716d
Polaris ported this. This is just a duplicate, now.
2016-10-17 14:38:55 -04:00
Cameron653
c535137bae
Fixes a problem with advanced_who
...
Advanced who was doing (Testname represents Ckey, StealthTest represents stealth Ckey)
"Testname" for admins when unstealthed, which was good, but it was doing
"TestnameStealthTest" when admins were stealthed.
This PR makes it start off as "Testname", then checks to see if they are stealthed. If so, it becomes "StealthTest," then adds in all the additional info (If they are observing, in lobby, or playing.)
2016-10-17 14:35:25 -04:00
Neerti
96767a6d05
Merge pull request #2647 from Anewbe/flashlight_device_cells
...
Flashlights use device cells
2016-10-16 17:34:54 -04:00
Neerti
b2e3f37213
Merge pull request #2620 from redstryker/ICEMTUC
...
Emergency Medical Response Voidsuit
2016-10-16 17:30:19 -04:00
Neerti
561e2709dd
Merge pull request #2622 from Anewbe/actual_embed_changes
...
Changes the way embedding works
2016-10-16 17:27:52 -04:00
Anewbe
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
Anewbe
bea401be2d
Fixes device cells
2016-10-16 13:42:16 -05:00
Anewbe
d76e4cd075
Flashlights use device cells
2016-10-16 13:30:38 -05:00
Anewbe
591d2719f3
Should fix penlights asking for cells
2016-10-14 21:29:03 -05:00
Anewbe
01b4c80ce4
Fixes Track spell
2016-10-13 18:27:28 -05:00
Anewbe
0def0f6789
Flashlight fixes
2016-10-12 23:20:19 -05:00
Neerti
955b5d1525
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/12/2016_overload_correction
2016-10-12 19:28:51 -04:00
Neerti
9404ad98fd
Overload Description Correction
...
Overload should correctly state how much damage it does, which is 0.3% of current charge, or 0.4% with the scepter of enhancement.
2016-10-12 19:26:39 -04:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Yoshax
b9e871bf5b
Quick flashlight fix
2016-10-10 02:27:58 +01:00
Spades
570c2474c3
Fixes w_class of items to be consistent with Polaris update ( #636 )
...
* Fixes w_class of items to be consistent with Polaris update
* Typo
2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04: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
redstryker
dbe19bdbd3
Emergency Medical Response Voidsuit
2016-10-09 14:55:53 -04:00
Neerti
32f87cac86
Merge pull request #2617 from Anewbe/cryo_batteries
...
Cryopods no longer eat the cells/ammo from weapons
2016-10-09 13:25:03 -04:00
Neerti
2e5c127ac8
Merge pull request #2616 from Anewbe/low_emp
...
Fixes low-yield EMP grenades
2016-10-09 13:24:56 -04:00
Neerti
46bade4426
Merge pull request #2615 from Anewbe/batteries_again
...
Batteries again
2016-10-09 13:24:51 -04:00
Anewbe
bfb6857a26
Gives Chain Lightning an icon
2016-10-08 20:28:41 -05:00
Anewbe
7cf2373da8
Cryopods no longer eat the cells/ammo from weapons
2016-10-08 19:51:39 -05:00
Anewbe
dacbca746c
Fixes low-yield EMP grenades
2016-10-08 19:38:49 -05:00
Anewbe
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
Anewbe
9ff32b5914
Weapon Cell Oversight fixes
2016-10-07 21:48:21 -05:00
Anewbe
f4aeb10fdc
Merge pull request #2606 from Yoshax/flashlights
...
Makes flashlights use cells
2016-10-07 21:26:13 -05:00
Yoshax
5fc4c4b889
Removes cell randomization and ensures slime flashlight things arent weird
2016-10-08 03:18:48 +01:00
