Commit Graph

9452 Commits

Author SHA1 Message Date
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
Aronai Sieyes 632300ceeb Merge pull request #3831 from VOREStation/upstream-merge-5327
[MIRROR] Changes "Setup Character" to "Character Setup"
2018-06-04 17:27:47 -04:00
Anewbe d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2
Changes "Setup Character" to "Character Setup"
2018-06-04 16:08:13 -04:00
Atermonera 76c8e20e2a Merge pull request #5301 from Anewbe/more_merc_mob_things
Adds armor to certain mobs, mercs have knives
2018-06-03 03:58:47 -04:00
Aronai Sieyes b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305
[MIRROR] Prevent autosay() from creating/deleting AIs
2018-06-02 19:03:02 -04:00
Anewbe 7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay
Prevent autosay() from creating/deleting AIs
2018-06-02 12:47:27 -04:00
pontifexminimus2 3ea860ae99 Typo
Oops, that doesn't belong there...
2018-06-02 18:32:42 +02:00
pontifex2 2f3fa81425 Assorted Zorren changes to make them in line with the lore I set up.
Changed their blood colour to a blue.
Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted.
Disabled the whitelist for Terminus.
Changed the description for Terminus so it's actually the Zorren's language.
2018-06-02 18:28:44 +02:00
Aronai Sieyes e04212d616 Merge pull request #3763 from Ketrai/master
Adds Fennix mob
2018-06-01 10:49:02 -04:00
Anewbe 25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove
Move character join log statement
2018-05-31 21:33:31 -04:00
Aronai Sieyes 1c46d7e501 Merge pull request #3750 from fludd12/splat
Prometheans melt on death.
2018-05-31 13:11:02 -04:00
Aronai Sieyes d96f4de071 Merge pull request #3775 from Novacat/nova-heterochromia
Adds Heterochromia Marking
2018-05-31 13:08:12 -04:00
Aronai Sieyes f0f03c1d6d Merge pull request #3788 from VOREStation/aro-issue-3787
Makes dogborgs spawn with bellies again
2018-05-30 02:59:09 -04:00
Arokha Sieyes 309a28911a Makes dogborgs spawn with bellies again
Fixes #3787
2018-05-28 21:02:58 -04:00
Arokha Sieyes 8fdb1d3191 Rat code cleanup
Fixes a compile warning and some other things (reduces view range, and how often they scan to be more like Ian)
2018-05-28 17:35:50 -04:00
Verkister 1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
2018-05-27 19:26:12 -04:00
Unknown c02a0973ff Adds Heterochromia Markings
Supports most species, with exception of Teshari, Skrell, and Vox.
2018-05-27 18:40:04 -04:00
Atermonera c7aad71147 Merge pull request #5295 from Anewbe/suit_sprite_issues
Spacesuits are now in their own dmi file
2018-05-26 15:25:58 -07:00
Atermonera 53db96d193 Merge pull request #5300 from Anewbe/more_runtimes
Adds a number of accessory related null checks
2018-05-26 15:23:03 -07:00
Ketrai 82e9c30aa7 Travis? 2018-05-26 22:51:05 +02:00
Ketrai 794db16782 Makes fennix attacks super weak. 2018-05-26 22:42:38 +02:00
Anewbe 13b205ee14 Merge pull request #5297 from Mechoid/FixBorgSynthesizers
Fix Engi Material Synths
2018-05-26 11:52:59 -05:00
Ketrai 8fb3bd6891 Adds Fennix code
Squelch
2018-05-26 15:45:11 +02:00
Mechoid 917c7b71a5 Box of Things for Events and the Future MK1 (#5281)
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
2018-05-25 16:26:31 -07:00
Atermonera 5957251397 Merge pull request #5280 from Anewbe/poi_tweaks
Merc PoI Tweaks
2018-05-25 10:56:40 -07:00
Anewbe d8f1069689 Adds a number of accessory related null checks 2018-05-25 12:29:33 -05: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
Mechoid a4d7699c0f Fix Engi Synths 2018-05-24 22:08:52 -07:00
Anewbe 841837191c Merge pull request #5296 from Anewbe/armor_fix
Fixes a runtime with armor checks
2018-05-24 18:39:55 -05:00
Anewbe beb88f7b7d Fixes a runtime with armor checks 2018-05-24 18:38:57 -05:00
Aronai Sieyes b1b9090430 Merge pull request #3757 from VOREStation/aro-cblind
Fix vulp colorblindness being mono instead
2018-05-24 19:33:24 -04:00
Arokha Sieyes 22bf8684e5 Fix vulp colorblindness being mono instead
Fixes #3740
2018-05-24 19:14:57 -04:00
Anewbe 1e05e23a78 Spacesuits are now in their own dmi file 2018-05-24 17:45:45 -05:00
Anewbe 49cf32f3b0 Fixes examine bugs 2018-05-24 17:08:45 -05:00
Aronai Sieyes abecdfe3fa Merge pull request #3499 from Verkister/engibork
New dogborg + Recycling update + Wet Dogborgs update
2018-05-24 17:45:08 -04:00
fludd12 e64e4ed0c8 Prometheans melt on death, and can now be revived. 2018-05-24 07:08:46 -04:00
Anewbe 0647b05cd3 Swapping hands cancels zoom 2018-05-21 23:17:46 -05:00
ReddeyfishVor 285663d1b1 Merge pull request #134 from Suhayll/Vale's-Medibork-Loadout-Changes
Medibork changes
2018-05-21 00:05:59 -07:00
Anewbe 6c7cf99236 Adds PoI specific merc mobs and turrets 2018-05-20 17:31:37 -05:00
Reddeyfish 813d7bf643 Merge branch 'virgoMaster' into virgoPull 2018-05-19 17:16:17 -07:00
Atermonera 4c1b43c765 Merge pull request #5265 from Anewbe/examine_grammar_1
Grammar tweak
2018-05-17 11:41:42 -07:00
Leshana d53f405fb0 Merge pull request #3709 from VOREStation/aro-sayreflect
Message send failure reflection
2018-05-16 20:46:19 -04:00
Atermonera 37047ff895 typo (#5266)
* typo

* Update mob.dm
2018-05-16 19:27:23 -05:00
Aronai Sieyes d52923b17c Merge pull request #3667 from Verkister/nifsleeve
Fixes a bunch of NIF/resleeving related issues (and a tiny otherthing i discovered during tests)
2018-05-16 18:41:01 -04:00
Arokha Sieyes 297ac38eca Message send failure reflection
When a post is too long to send, reflect it back to the user in the chatbox so they can copypaste it into separate messages. Also increases the message limit from 1024 to 2048. If a message is longer than 5-messages worth, it is not reflected and a warning is sent instead to avoid easily consuming bandwidth for DDOS purposes with long messages.

I'd like to add markers in the message where the posts would have been truncated but that's... complicated.
2018-05-16 17:57:26 -04:00
Valekin 66e0d04a54 Medibork changes
This will change the load out for mediborks. 
It will add:

****Medical Gripper. Allows borgs to pick up beakers and open bottles. As well as pick up phoron crystals for grinding. This will allow them to create phoron based chems and setup cryo byond (heh) just turning them on. It also allows them to pick up pills and force them on patients such as carbon pills. It also allows picking up blood packs and placing them in IV's.
Full list of items are that can be picked up are:
 /obj/item/weapon/reagent_containers/glass,
		/obj/item/weapon/storage/pill_bottle,
		/obj/item/weapon/reagent_containers/pill,
		/obj/item/weapon/reagent_containers/blood,
                /obj/item/stack/material/phoron

****Traumakits, Advance Burn kits, and Splints.

Items work just as the normal ones. The only twist is that they got practically infinite ammo.  (1000 actually according to the code) 
However, Do not be fooled by the amount of charge it has when examining it.
But they may only apply it once per-limb so no heal spamming. Even after that limb takes damage again. You got to wait until the "already treated" thing wears off to reapply.

*Traumakits: The main use of the trauma kit is to stop external bleeding.
*Burn Pack: Main use of burnpack (ointment) Is to treat burn damage overtime. It seems useless next to the hypospray but who knows. It treats about 2.2 burn damage on use so it just might bring a burned victim's damage down enough to be defibbed.
*Splints: Lets you treat a patient with bone damage as best you can while waiting for a surgeon to show up. Of course won't actually fix anything, but at least they'll stop falling down in pain or dealing self damage by moving with broken bones.
2018-05-15 23:18:16 +03:00
Verkister 1a6441cbcb Squashed commit of the following:
commit 0422337a1ff4a96f27566727fb613f4a9ee993b1
Merge: bebd37667f 54d3e6d049
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 15 12:22:42 2018 +0300

    Merge branch 'engibork' of https://github.com/Verkister/VOREStation into engibork

commit bebd37667fa38890590b46f45e9dc6bd76f13c56
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 15 12:07:45 2018 +0300

    Engie borgo + Recycling update + Wet Dogborgs update
    -I really hope this squash merge attempt didn't go catastrophically wrong.

commit 54d3e6d049aee607daf7b356b4f5c2f7862ea9d9
Merge: af7807b238 36b6015aeb
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon May 14 12:39:53 2018 +0300

    Merge branch 'master' into engibork

commit af7807b2386a3a3f222a012ecec2db2914bf3340
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 8 13:19:22 2018 +0300

    Adds verb to refill borg extinguisher with water reserves.
    -Also makes human prey gurgled in sleeperbellies also give water according to their weight and size multiplier.

commit 700cbadfad4f13e976d8da5e5ac19c4381b84d4b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 30 16:13:43 2018 +0300

    The Wet Dogborg Update
    -Dogborgs now come with water reserve. (1000u, starts empty)
    -The water reserve is used by the tongue actions and floor scrubbing, which now require water.
    -Tongue actions spend 5 units each, and the scrubbing uses one unit per tile.
    -Yes, the licks also require water now. Slobbery.
    -The floor scrubbing can now be toggled on and off to preserve water.
    -The scrubber switch is a sprited module of its own for handy onscreen access when active.
    -The water reserves can be refilled by gurgling any reagents with sleeperbellies, and by using the tongue to lap up water from sinks and toilets lol.
    -Added a double check to analyzer belly to prevent it gaining levels from protected items.

commit 6872579dd9a91304dd0c00f6b0d78689bac63242
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Apr 19 18:25:59 2018 +0300

    oop

commit e50eba11034f14883a89c4a1031c344fca0c3b40
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Apr 19 18:19:30 2018 +0300

    Adds yet another new dogborg and other tweaks.
    -New engie oriented borgo comes with basic construction tools and stuff, no rcd or other fanciness.
    -Sheet synthesisers on this borg come with some extra capacity with the drawback of significantly slower charger replenish.
    -This comes to the other thing, which is the belly.
    -New borgo has a "matter decompiler" feature, which means it can recycle stuff to fill the material reserves. This thing reycles materials with autolathe rates though, none of that op drone decompiler stuff.
    -Now also janihound gut has a recycling feature.
    -The recycling guts don't give the borg any charge for the recyclable items, but other stuff charges fine.
    -Dogborg light replacer now starts with only 10 lights, and recharging it on the go draws resources from the recycled material reserves. Also it no longer recharges in borg charger.
    -Janihound can now also stack and drop steel/glass sheets to get the stuff out of the reserves.

    Other fixes:
    -Fixes certain dogborg tools not getting their naughty features unlocked with scrambled upgrade.
    -Minor fixes and cleanups in borgo sleeper code.
    -etc.

commit 096504ca95b8a662e911a1e92c195fe69a624f93
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Apr 18 08:14:04 2018 +0300

    Adds engie bork
2018-05-15 12:39:52 +03:00
PrismaticGynoid eabfa03891 Laser pointers (#5257)
* Laser pointers

Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.

The bugfixes which make several of the features work properly will come in a separate commit.

* Three fixes

Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.

Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.

Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.

(removes errant debug message too, whoops)

* Nerf

Reduced chances of laser pointers doing anything useful on silicons.

Also, fixes a duplicated proc, oops.

* Requested changes

Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().

Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.

Also, does another small nerf to the effects on silicons.
2018-05-14 15:22:19 -07:00
drexample 5d73584fa3 Adds the Statue - A hostile mob, that moves only when you don't see it (#5108)
* Statue

* Statue done!

* Testing map removed

* Grammar fix + ignoring creator

* Fixed typos, change range to oview, thanks to Atermonera

* made changes that I missed

* Nightvision handling

* diverse blind messages + requested changes

* Bugfixes, added isSynthetic to bots

* commentaries + PoI

* Finalized POI and statue

* removed misclick
2018-05-14 15:21:04 -07:00