Commit Graph

29125 Commits

Author SHA1 Message Date
elgeonmb
4fe72daba3 curlyboy 2017-10-04 17:31:16 -07:00
elgeonmb
5361299b9f Update organizations.dm 2017-10-04 17:30:13 -07:00
elgeonmb
1cb7f36c6c Adds new organization-specific locations in the tracon module
and misc tweaks.

1) Adds systems with lore and trade with SCG to the generic destinations list

2)Gives Vey-Med some Skrell-focused destinations

3)Gives Heph some millitary destinations

4)Gives Morpheus trade with Shelf

5)Strips out the "Icarus" generic ship name and the NDV Icarus Nanotrasen destination. Suddenly this word has a lot of history and I somehow don't see NT naming a ship after the political party they're bitterly opposed to
2017-10-04 17:18:43 -07:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Cameron653
02682ede9a This shouldn't be capitalized 2017-10-04 13:54:07 -04:00
Cameron653
2d05e410fe Makes ion storms not emag bots
Because fuck that
2017-10-04 13:45:41 -04:00
Anewbe
cf9245b5fb More work on outfits 2017-10-04 11:49:24 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Anewbe
0de6cddef5 Activates Neerti's Lawbook 2017-10-03 22:29:50 -05:00
Neerti
24f517336b Merge pull request #4013 from Anewbe/event_rank
Does more prep for the Event Manager role
2017-10-03 23:26:01 -04:00
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender
Adds the gravekeeper lost borg module
2017-10-03 23:01:15 -04:00
Neerti
fe9822362c Merge pull request #3979 from Anewbe/tracking_implant
Improves tracking implant code, adds a tracking implant variant to the loadout
2017-10-03 22:58:10 -04:00
Neerti
ca7de7e98b Merge pull request #3973 from Anewbe/breath_temp
Splits cold/heat processing into breath and body vars, species temp tweaks
2017-10-03 22:57:56 -04:00
Spades
96e59805de Merge pull request #2263 from Cameron653/PROMETHEAN_STUFF
Promethean stuff
2017-10-03 22:33:17 -04:00
Spades
0a3a116f81 Merge pull request #2260 from Cameron653/HAIR_CKEY_LOCK
Allows hair to be Ckey locked
2017-10-03 22:32:18 -04:00
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
Anewbe
46994b378d Adds a null check for not having a backpack 2017-10-03 16:16:35 -05: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
Spades
9491f4b9b3 Merge pull request #2254 from VOREStation/osha-approved
OSHA approved map changes
2017-10-03 03:57:30 -04:00
Spades
aa10a65b30 OSHA approved map changes
- More fire lockers and oxy closets in places.
- All elevator entrances have emergency shutters in front of them, which
can be used as a defacto airlock if needed.
- All fire closets have emergency toolboxes now.
- Other minor map edits.
2017-10-03 02:49:45 -04:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
Spades
e40a9da769 Fixes camera layering
This was annoying the absolute fuck out of me.
2017-10-03 00:40:54 -04:00
Neerti
c431d983fb Merge pull request #4003 from Anewbe/boots_of_speed
Makes the boots of speed slower, and boots.
2017-10-03 00:40:48 -04:00
Anewbe
bf6c9ba4b8 Drone permits can now be worn 2017-10-02 23:14:14 -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
6ba5d9647b Merge pull request #2240 from Neopatra/master
Add Taursuits to Respective Lockers
2017-10-02 04:19:37 -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
Spades
ab7446465d Merge pull request #2236 from Cyantime/glassexternal
Makes all external airlocks glass.
2017-10-02 04:18:26 -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