Commit Graph

9403 Commits

Author SHA1 Message Date
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
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
Anewbe
13b205ee14 Merge pull request #5297 from Mechoid/FixBorgSynthesizers
Fix Engi Material Synths
2018-05-26 11:52:59 -05: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
Anewbe
0647b05cd3 Swapping hands cancels zoom 2018-05-21 23:17:46 -05:00
Anewbe
6c7cf99236 Adds PoI specific merc mobs and turrets 2018-05-20 17:31:37 -05: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
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
Atermonera
48c30ec026 Merge pull request #5262 from Anewbe/go_home
Simple Animal GoHome range is a lot smaller
2018-05-14 15:18:53 -07:00
Arokha Sieyes
0e7f365286 Fix SSAO mode mouse opacity problem
Fixes the title!
2018-05-14 11:00:46 -04:00
Arokha Sieyes
1371249c80 Fix SSAO mode mouse opacity problem
Fixes the title!
2018-05-14 10:56:19 -04:00
Anewbe
cfc6d1a721 Grammar tweak 2018-05-13 23:05:09 -05:00
Aronai Sieyes
59a852ae45 Merge pull request #3661 from VOREStation/aro-ssao-vs
Ports 'fake' SSAO from /tg/ as a preference
2018-05-13 23:33:02 -04:00
Aronai Sieyes
dc9037f45e Merge pull request #3670 from Verkister/indigestion
Makes gurgle gains scale according to actual received damage.
2018-05-13 23:21:21 -04:00
Aronai Sieyes
ba6a2b5641 Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01
Polaris Sync 2018-05-01
2018-05-13 23:20:18 -04:00
Neerti
7b73336244 Merge pull request #5261 from VOREStation/aro-ssao
Ports 'fake' SSAO from /tg/ as a preference
2018-05-13 17:20:28 -04:00
Anewbe
0a5e7f72a7 GoHome range is a lot smaller 2018-05-13 00:03:21 -05:00
Verkister
08269f45fb Makes gurgle gains scale according to actual received damage.
-Fixes armored, synthetic, and otherwise resistant prey giving several times more nutrition than their squishy counterparts.
-They will still take longer to digest, but what would ya expect for armor, at least the gains are at the correct level now.
-Same for sleeperbellies.
-Also made sleeperbelly gurgledamages non-hardcoded vars but there's no knob for them yet.
2018-05-11 16:14:02 +03:00
Verkister
1c519d28ed More small fixes and such.
-Applies the suggested durability tweak.
-Makes backups save nif examine message.
-Makes new nifs spawn with the examine message if provided upon resleeving and such. Basically the initial character spawn pref loading was the only case that wasn't resetting the message to default.
-Fixes soulcatcher backups breaking ooc notes. (Applies ooc notes from character to the brainmob before saving it. Also includes brainmobs into the formerly human exclusive backup part responsible of saving nif and ooc notes to backups.)
-Makes soulcatcher backup feature back up the owner if dying inside a belly of a soulcatcher lacking pred. (SC backup setting was completely voided if the pred didn't have SC themselves so your shit would be gone for good)
-Fixes contaminate/digest_act sending holder mobs to shadow realm if holder is contained inside the equipment(storage/pockets) of a prey getting gurgled instead of the pred's gut. (As prey gear gets all contaminated at once while getting dumped in the gut, which would contaminate>digest_act the holder items prematurely during the gurgle dump.)
2018-05-11 13:49:16 +03:00
Aronai Sieyes
fd04336d89 Merge pull request #3655 from VOREStation/aro-fps
Adds a client FPS setting
2018-05-10 15:46:29 -04:00
Arokha Sieyes
c4f9017c76 Rename snake to giant snake
To prevent mistakes like this in the future!
2018-05-10 14:26:18 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
Anewbe
8615dafd40 Merge pull request #5255 from VOREStation/pol-fps
Adds a client FPS setting
2018-05-10 00:27:44 -05:00
Arokha Sieyes
f746821964 Ports 'fake' SSAO from /tg/ as a preference
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
2018-05-09 14:51:07 -04:00
Arokha Sieyes
634527aa5b Ports 'fake' SSAO from /tg/ as a preference
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
2018-05-09 14:49:00 -04:00
Arokha Sieyes
8f876de645 Adds a client FPS setting 2018-05-07 23:37:47 -04:00
Arokha Sieyes
fe5633e3d8 Adds a client FPS setting 2018-05-07 23:36:47 -04:00
Atermonera
7b17d2ce36 Merge pull request #5246 from elgeonmb/species
improves and adds onto tt_descs
2018-05-07 19:57:49 -07:00
Arokha Sieyes
29aa4c28a0 Process text formatting in subtle messages like say/emote/whisper
Fixes #3638
2018-05-06 01:19:02 -04:00
Aronai Sieyes
5108d13609 Merge pull request #3629 from VOREStation/aro-colorblind
Fix Colorblindness
2018-05-05 11:30:37 -04:00
Spades
ba5bfa00bb Merge pull request #3583 from Verkister/chompychomp
Adds a funky fresh feature to beartraps.
2018-05-05 08:32:38 -04:00