Arokha Sieyes
c2c96e37b6
Do NOT qdel() all client.screen objects
2016-10-22 22:12:11 -04:00
Arokha Sieyes
4e7f389423
Remove 'extra' helmet from RD rig
2016-10-21 18:52:07 -04:00
Arokha Sieyes
2dd7369080
Remove trailing slash, update suit name because I can't decide
2016-10-21 16:40:20 -04:00
Arokha Sieyes
780f0fa603
Squelch death messages from inside mobs
2016-10-21 15:37:22 -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
3a564a655e
Merge pull request #666 from Screemonster/bugmonstertweaks
...
Multiple xenochimera tweaks
2016-10-20 21:01:20 -04:00
Arokha Sieyes
7ff0d1e1e5
Merge pull request #668 from VOREStation/issuebreaker
...
Fix for several issues (455,443,239)
2016-10-20 20:59:29 -04:00
Arokha Sieyes
723e835801
Removed comments
2016-10-20 16:41:15 -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
Arokha Sieyes
6d533df04f
Merge pull request #663 from JoanRisu/Fluff_Items_worshop
...
Fluff items worshop....5? Sequels are hard.
2016-10-20 12:38:15 -04:00
Screemonster
e59c33b554
fixes and improves some bugs
2016-10-20 04:03:46 +01:00
Spades
6b1a32a12f
Merge pull request #664 from VOREStation/unifroms
...
Further tweak to tempest hud
2016-10-19 21:23:44 -04:00
Arokha Sieyes
f4c0239ab5
Further tweak to tempest hud
2016-10-19 20:23:23 -04:00
JoanRisu
ae797f1e85
quick hotfix
2016-10-19 17:05:53 -07:00
JoanRisu
1bc67f334b
Lots changes. Mostly involves getting the charges for Aro's gun and my Dominator, attempts to fix Molener's items, little typos fixes here and there. Also changes some item sprites.
2016-10-19 17:02:14 -07:00
Spades
8ca3d2eaaf
Merge pull request #662 from VOREStation/unifroms
...
Fed and KHI Uniforms/Suits
2016-10-19 19:56:38 -04:00
JoanRisu
60d3b937b9
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2016-10-19 14:07:51 -07:00
Arokha Sieyes
3acc33c3a5
Fed and KHI Uniforms/Suits
...
Adds Joan's Fed overcoats and my KHI uniforms as optional alternate uniforms for departments. Each requires you to be in that department to let you spawn with it.
(The Kitsuhana.dmi change is a change to my own synth sprite to fix a sprite error, unrelated)
(Also updates the sprite in custom_clothes_vr.dmi for an item for Tempest for her medhud)
2016-10-19 15:20:35 -04:00
Spades
2ea9555d86
Merge pull request #657 from Cameron653/master
...
Makes the server include advanced_who
2016-10-19 03:13:43 -04:00
Spades
a1d76ae136
Merge pull request #660 from VOREStation/oocformat
...
OOC sanitize like Flavor sanitize
2016-10-18 14:47:28 -04:00
Spades
d908eccf95
Merge pull request #659 from VOREStation/disallow-empty-ooc-notes
...
Force having OOC notes set to spawn
2016-10-18 14:47:19 -04:00
Spades
af4ef14bc6
Merge pull request #653 from VOREStation/fix541-again
...
Fixes attacking from inside voremobs, again
2016-10-18 14:47:03 -04:00
Arokha Sieyes
5616752804
OOC sanitize like Flavor sanitize
...
I was sick of OOC flavortext not creating links, not allowing linebreaks, etc. So I made it do those things. Now it's the same as normal flavortext instead of a "completely unformatted hellscape of trying to read".
2016-10-18 11:52:28 -04:00
Eearslya
334cb48dab
Force having OOC notes set to spawn
2016-10-17 23:25:07 -07:00
Neerti
67330d1df6
Merge pull request #2652 from Anewbe/dislocate_numbers
...
Lowers the dislocate chance and damage from disarm intent hits
2016-10-17 22:36:08 -04: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
Anewbe
33b00b8762
Lowers the dislocate chance and damage from disarm intent hits
2016-10-16 21:47:42 -05:00
Eearslya
066e50e61e
Fixes attacking from inside voremobs, again
...
Fixes #541
2016-10-16 15:36:47 -07: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
Neerti
b0ebe0e4eb
Merge pull request #2648 from Anewbe/tape_roll
...
One requires a grip to use tape rolls on people
2016-10-16 17:26:53 -04:00
Neerti
78a1e1cf48
Merge pull request #2631 from MagmaRam/bloodloss
...
Bloodloss balancing
2016-10-16 17:26:41 -04:00
MagmaRam
e066506ccb
Blunt weapons can no longer cause cuts.
...
This is a necessary change for the intended effect of this bloodloss
system.
2016-10-16 15:53:04 -05:00
MagmaRam
289d32c23a
Used the wrong defines for the organ tags, whoops.
2016-10-16 15:52:17 -05:00
Spades
f4402f5d94
Fixes lights overlapping big mobs. Sort of.
2016-10-16 16:42:39 -04:00
Anewbe
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
Neerti
f7706373b2
Merge pull request #2646 from Anewbe/device_cell_fixes
...
Fixes device cells
2016-10-16 14:51:36 -04: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
ced74308e9
Fixes some Cargo crate issues
2016-10-16 13:21:05 -05:00
Anewbe
591d2719f3
Should fix penlights asking for cells
2016-10-14 21:29:03 -05:00
Arokha Sieyes
285914f1e5
Merge pull request #651 from VOREStation/arofluff
...
Adds KH life crystal fluff/loadout item
2016-10-14 10:17:51 -04:00
Arokha Sieyes
a11d4d202e
Small tweak
...
Just optimized it so it wouldn't stay being processed if the user leaves via elevator/cryo or is admin-deleted.
2016-10-14 02:34:58 -04:00
