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
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
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
Spades
e40a9da769
Fixes camera layering
...
This was annoying the absolute fuck out of me.
2017-10-03 00:40:54 -04:00
Spades
3d64d440f7
Merge pull request #2246 from Verkister/spriteshitonceagain
...
Some more sprite accessory stuff.
2017-10-02 23:47:08 -04: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
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
JOAN-RIG\Joan Risu
91eda4a26c
Formatting changes
2017-10-01 20:11:31 -07:00
Cameron653
b6a1c86e33
Update resize_vr.dm
2017-10-01 20:30:52 -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
Neopatra
2503183c21
Adds Taur hazmat and Rad suits to lockers
...
As well as bomb suits.
2017-10-01 09:30:32 -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
killer653
d4ab222470
Adds Kira72's fluff
2017-09-30 19:55:29 -04:00
Cyantime
6e23d8c51b
Hotfix for brute damage digestion setting
2017-09-30 16:30:51 -04:00
Cyantime
cae50ec557
Makes all external airlocks glass.
2017-09-30 16:11:15 -04:00
Cameron653
b83a7c4370
Makes neutral traits not take trait slots
2017-09-30 13:35:25 -04:00
Verkister
e9ed36d6e1
Travis croaked.
2017-09-30 13:35:56 +03:00
Verkister
e97a0394a7
Buffs guardpup pounce chance.
...
-Because we probably don't want the criminal too mauled before the catch.
-Good boys don't do excessive police brutality.
2017-09-30 13:12:44 +03:00
Spades
5c612c1b66
Merge pull request #2224 from VOREStation/Cameron653-patch-3
...
Reenables solar grub events
2017-09-30 03:14:03 -04:00
Spades
158cb28526
Merge pull request #2230 from JoanRisu/Fluff_Items_worshop
...
Drake's Starfleet Security uniform
2017-09-30 03:13:09 -04:00
Spades
76e586bea1
Merge pull request #2226 from Cameron653/BLOODSUCKING
...
Adds bloodsucker trait
2017-09-30 03:13:01 -04:00
Spades
f6e04a6ce6
Merge pull request #2228 from Cyantime/mapfixes
...
A pile of small map fixes and minor tweaks.
2017-09-30 03:12:22 -04:00
JOAN-RIG\Joan Risu
b55d19c74d
Added Drake's uniform to the custom items list
2017-09-29 23:24:32 -07:00
Cyantime
ede7f79dfe
Forgot this.
2017-09-30 00:28:33 -04:00
killer653
da09bbdc17
Suck Ze Bloodbags
2017-09-29 23:30:29 -04:00
killer653
1f48f84734
Adds bloodsucker trrait
2017-09-29 23:07:36 -04:00
Cameron653
c46c397280
Fixes Beyondmylife's coat
2017-09-29 20:52:08 -04:00
Verkister
02c5c25d8c
Mice.
...
-Brings back the cat mouse targeting. The earlier removal had made the pups a bit too passive around them.
2017-09-30 02:22:36 +03:00
Verkister
6d814dd632
Mice are the anti-donut now.
...
-A guardpup belly mode safetied by a successful crime catch now turns back to unsafe upon eating a mouse.
-Not hacky or anything haha. Just intentional scatterbrain shit of a yummier prey making the klutzpups forget about their prisoner transportation duty :v
2017-09-30 02:16:32 +03:00
Cameron653
236e7812e3
Reenables solar grub events
2017-09-29 18:52:01 -04:00
Spades
c340692492
Merge pull request #2206 from MechaFrogg/master
...
Added Frog Taurs
2017-09-29 18:14:34 -04:00
Spades
7991dfcc47
Merge pull request #2215 from Cameron653/RIDING_CROP
...
Adds riding crop
2017-09-29 18:14:24 -04:00
Spades
cfb1d39b95
Merge pull request #2216 from Ketrai/patch-3
...
Allows nom on bumb behavoir for solargrubs
2017-09-29 18:14:16 -04:00
Spades
dfd7e024a1
Merge pull request #2222 from Cyantime/bombzone
...
Adds a plasma research outpost.
2017-09-29 18:13:10 -04:00
Spades
57398cdaf1
Merge pull request #2218 from Pawoverlord/pawoverlord_fluffitem
...
Update custom_permits_vr.dm
2017-09-29 18:12:42 -04:00
Cyantime
9b154516a0
Needs this too.
2017-09-29 02:38:54 -04:00
Cyantime
36e78b48f1
Adds plasma research outpost.
2017-09-29 02:28:43 -04:00
