Commit Graph

18657 Commits

Author SHA1 Message Date
Spades
176a425188 Merge pull request #2256 from Verkister/spriteshitonceagain
More hyuuge icon blending overhauls! (ADDrocities begone!)
2017-10-03 22:31:43 -04:00
Spades
54d4069eff Merge pull request #2195 from Verkister/returnofthelongpup
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
2017-10-03 22:31:24 -04:00
Anewbe
52093c1d48 Adjusts checks for turf-slowed movement 2017-10-03 17:54:56 -05:00
killer653
e3dd5e4e53 Small tweak 2017-10-03 18:47:10 -04:00
killer653
a399fd09e0 Promethean fix & readding slime mutation toxins 2017-10-03 18:45:10 -04:00
Layla Crosse/Occula Drenn
c42e789b4e ACTUALLY FIXING LILIAN'S WHITELIST WITHOUT WEIRD ERRONEOUS THINGS. 2017-10-03 18:24:50 -04:00
killer653
58a85b059f Allows the ability to Ckey lock hair 2017-10-03 18:04:31 -04:00
Cyantime
324ff70a42 Fixes neutral traits. 2017-10-03 15:28:01 -04:00
Verkister
3ef9e21923 Tested working yay. 2017-10-03 20:04:37 +03:00
Verkister
2a0de4b06e More hyuuge icon blend mode overhauls!
-Converted unathi base sprites and blending to MULTIPLY mode.
-Converted tajaran base sprites and blending to MULTIPLY mode.
-Converted skrell base sprites and blending to MULTIPLY mode.
-Converted teshari base sprites and blending to MULTIPLY mode.
-Converted pretty much every colorable hairstyle to MULTIPLY mode.
-This includes species specific and facial hairs as well.
-Added more 'furry' races to the vulp hairstyle compatibility list.
-Removed the old ears from the sergal hairstyles.
-Applied the earlier hand/arm overlap fix to the synthsergal limbs as well.
-Proved myself some sort of a goddamn deity over actually doing this shit that was supposed to be impossible to pull off at this point lmao.
2017-10-03 18:24:07 +03:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
Spades
3d64d440f7 Merge pull request #2246 from Verkister/spriteshitonceagain
Some more sprite accessory stuff.
2017-10-02 23:47:08 -04:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
elgeonmb
e5474c2dc1 Food fluff (#4008)
* food fluff

* Update polaris.dme

* what the hell is Jargon 4

* screeching

* somehow that last one broke something

* how can I not spell vacuum
2017-10-02 19:59:00 -05:00
Anewbe
a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -05:00
Ketrai
21e97e0d65 Clarifies the grubevent announcement.
Now grubs are nerfed, this hopefully will clear up any misunderstandings. All crew should be able to deal with grubs, and certain departments shouldn't monopolize the killing. (or feel required to interrupt scenes to chase down grubs, they're not that strong anymore.)
2017-10-02 20:49:10 +02:00
Verkister
3b05d12bc3 Merge branch 'master' of https://github.com/VOREStation/VOREStation into spriteshitonceagain
# Conflicts:
#	icons/mob/human_face_vr.dmi
2017-10-02 20:51:54 +03:00
Verkister
5ac851be51 Some more sprite accessory stuff.
-New set of modular one-limb longsock markings.
-Eggnerd FBP color panel markings set (sorry serds, had already been planning this since the moment i figured out the synth markings stuff)
-Dual-color mech tail relating to the forementioned.
-Made otie ears dual-colorable as originally intended.
-Fixed sergal markings covering their eyes.
-Also slightly tweaked the eyes.
2017-10-02 20:47:59 +03:00
Spades
f95fa03410 Merge pull request #2243 from JoanRisu/Fluff_Items_worshop
Formatting changes for spawn list
2017-10-02 04:21:30 -04:00
Spades
5df330c17f Merge pull request #2244 from VOREStation/permit
Ace's gun permit
2017-10-02 04:20:41 -04:00
Spades
7fc1a59ff0 no underscores you ding dong 2017-10-02 04:20:28 -04:00
Spades
65c23ae9ad Merge pull request #2242 from VOREStation/Cameron653-patch-7
Moves adjust mass from IC to Abilities
2017-10-02 04:19:45 -04:00
Spades
530d758540 Merge pull request #2239 from Ketrai/patch-5
updates grub-food
2017-10-02 04:18:49 -04:00
Spades
cac9d2b888 Merge pull request #2238 from Cameron653/CUSTOM_STUFF
Adds Kira72's fluff
2017-10-02 04:18:35 -04:00
Anewbe
860c1d2e9f Makes the auto-antag-record logging for loadout items prettier 2017-10-02 03:08:01 -05:00
Spades
1a14b8ada7 Ace's gun permit
- Readded Ace's gun permit.
- Rearranged the permits to be in alphabetical order while I was at it.
2017-10-02 03:03:35 -04:00
Anewbe
5e635aff46 Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime. 2017-10-02 00:11:27 -05:00
JOAN-RIG\Joan Risu
91eda4a26c Formatting changes 2017-10-01 20:11:31 -07:00
Anewbe
46e411f80f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant 2017-10-01 21:52:36 -05:00
Anewbe
90776f4051 Merge pull request #4009 from elgeonmb/skrelltalk
Strips special characters from Skrellian syllable list
2017-10-01 21:23:49 -05:00
elgeonmb
77aadf1d4a strips special characters from Skrellian 2017-10-01 19:12:44 -07:00
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
ElectricB1ue
e67df48111 Changes the leg holster item sprite. (#3994)
* Add files via upload

* Changes the item sprite
2017-10-01 20:19:43 -05:00
Cameron653
b6a1c86e33 Update resize_vr.dm 2017-10-01 20:30:52 -04:00
elgeonmb
9acc8a5d2c Cigarette Grammar + Lorefixes (#3999)
* Cigarette Grammar + Lorefixes

The grammar in the original was a little wonky and we all know how I feel about wonky grammar. Also made Jerichos a SAARE thing since Heph doesn't really _use_ their guns and brought fashionable menswear to the masses.

* woops made an error as I was trying not to make an error

* forgot menthols
2017-10-01 13:59:21 -05:00
Neerti
51e980ebdc Merge pull request #3984 from Anewbe/less_meat
Less meat from Clonex+Blood
2017-10-01 14:48:42 -04:00
Cyantime
ad4f15e216 It's not a spawn class idiot 2017-10-01 14:47:47 -04:00
Cyantime
4046b90854 Limits bluespace harpoon teleportation range. 2017-10-01 14:38:44 -04:00
Anewbe
5d819ade53 Fixes the entire cloning_sickness PR 2017-10-01 12:50:06 -05:00
Neerti
23b0312af9 Merge pull request #3975 from Anewbe/no_clone
Adds a no_clone modifier
2017-10-01 13:29:25 -04:00
Neerti
4a0ef92303 Merge pull request #3985 from Anewbe/crabs
Adds giant crabs
2017-10-01 13:28:30 -04:00
Ketrai
12ea8d0d8d updates grub-food
Makes it so you can slice the bugball food item as intended, so you can decontaminate it before serving.

(previously the bugball had to be decontaminated, bitten open, then decontaminated again to avoid poison)
2017-10-01 13:20:10 +02:00
Anewbe
1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Anewbe
ab0c05bdf7 Merge pull request #3988 from Mechoid/Mecha_2_The_Mechening_V_1
Brain-Mech fix, MMI Runtime fix, Mecha Wall Punching Fix
2017-09-30 21:44:59 -05:00
Anewbe
03abb61e2e Merge pull request #3989 from Neerti/9/30/2017_shield_tweaks
Directional Shield Tweaks
2017-09-30 21:43:27 -05:00
Neerti
b8a7749351 Technomancer Golem Tweaks & Simple Animal Health "Refactor"
Simple animals now use the base health system that most other mobs use.
Fixes a bunch of Destroy()s so that they should qdel properly.
Mend Synthetic can heal synthetic simple animals.
Adds attack and spellcast animations to the golem.
Adds system to manually flick because byond is stupid sometimes.
Removes shield and reflect spells from the golem since SAs can't use shields at the moment.
Adds more helpful spells to the golem.
Golem and the Lost Drone now use the 'synthetic_evil' speech bubble.
2017-09-30 22:24:42 -04:00
killer653
d4ab222470 Adds Kira72's fluff 2017-09-30 19:55:29 -04:00
Neerti
459fbbdc2a Merge pull request #3952 from Anewbe/slimejelly
Makes it possible to get slimejelly
2017-09-30 17:47:27 -04:00
Cyantime
6e23d8c51b Hotfix for brute damage digestion setting 2017-09-30 16:30:51 -04:00
Cameron653
b83a7c4370 Makes neutral traits not take trait slots 2017-09-30 13:35:25 -04:00