Commit Graph

363 Commits

Author SHA1 Message Date
Kelshark
081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
2017-03-03 19:17:04 -05:00
Kelshark
fd626b4d70 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-03-03 19:10:18 -05:00
Arokha Sieyes
4c3504365b Merge pull request #1071 from VOREStation/aro-softproblems
Redo Vore Panel Interactions
2017-03-03 14:48:05 -05:00
Arokha Sieyes
809110eda1 Merge pull request #1065 from JoanRisu/Fluff_Items_worshop
Fluff items worshop.....15???
2017-03-03 14:26:43 -05:00
Arokha Sieyes
3986b40007 One more small tweak for prey in bellies
Can't touch items that have already left
2017-03-03 14:23:33 -05:00
Arokha Sieyes
fcd57c1131 Redo Vore Panel Interactions
- Redid belly interactions into a hide-able section to keep it nice and clean.
- Changed most 'error' messages into modal alert boxes to make it obvious.
- Remade name/desc/bellycount rules into defines at the start of the file.
- Fixed transfer problems as far as I can tell (Fixes #1063 Fixes #763)
- Can't delete transfer location bellies. Notifies you what points at it and tells you to change it first.
- Get rid of the -1% thing. Just set it to 0% if you don't want it to happen.
- Added a little '?' help button for general interaction info.

https://gyazo.com/b8fb247c0ac101753795a400d61240d0
2017-03-03 14:20:37 -05:00
JoanRisu
3785bd3700 ~Changes flag for squirrelkin language
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
2017-03-03 03:39:00 -08:00
Screemonster
89a0559077 Add's vinjj's fancy bandana 2017-03-03 11:33:02 +00:00
JoanRisu
7653763fc4 Merge pull request #1059 from Poojawa/trekuniforms
trek uniforms + loadout listing
2017-03-03 01:05:53 -08:00
Poojawa
7891bf2b52 Trek Uniforms 2017-03-03 02:51:05 -06:00
JoanRisu
ceca64804d Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-02 23:28:45 -08:00
JoanRisu
3f26a1d223 Some personal changes to my items and adds a dune buggy for science expeditions. 2017-03-02 23:17:04 -08:00
Arokha Sieyes
c5c0af4f2f Adds AI Vore Capability
Also just general AI QOL things.

AIs have a "Hardlight Noms" verb in the Vore tab. When their hologram is on top of a person, they can pick this, and will homf them. Takes 5 seconds, neither of you can move or it cancels. Holograms with someone inside become almost opaque and purple. They also have different examine text.

A hologram with someone inside cannot move through glass/tables/etc. Pressing "Hardlight Noms" again will give the option of dumping the prey out. Derezzing the hologram will also do this. Also because the hologram can be 'blocked' by things now when full, moving the hologram off the screen will derez it and dump the prey too.

AIs can examine mobs now to get flavortext and OOC notes. Shift-click only. This is for annoying technical reasons. Sorry to those that like to right-click and click examine.
2017-03-02 21:54:19 -05:00
Poojawa
1375db16bc fixes typos 2017-03-02 15:06:48 -06:00
Poojawa
c062a0cfe1 trek uniforms + loadout listing 2017-03-02 12:00:19 -06:00
Dhaeleena
7712aabda9 Permit for cat gun 2017-03-01 19:58:33 -03:00
RadiantFlash7
576dcfb07a Map work&compiling fix
Mad work 2.0, +fixed compile issue with Icon_state in custom clothes.dmi
2017-02-28 23:51:21 -05:00
Arokha Sieyes
d0b05966fe Merge pull request #1046 from VOREStation/aro-antlers
Adds antlers "ears" choice
2017-02-28 15:20:11 -05:00
Arokha Sieyes
662d0c2a61 Adds antlers "ears" choice
What it says.
2017-02-28 14:19:44 -05:00
Spades
eeef3247bb Merge pull request #1043 from Screemonster/master
Adds nerdglasses
2017-02-28 13:55:33 -05:00
Arokha Sieyes
edd01df634 Merge pull request #1045 from VOREStation/aro-ghosttoggle
Prevent ghosts from toggling s_a digestion
2017-02-28 13:30:26 -05:00
Arokha Sieyes
da6dad6992 Prevent ghosts from toggling s_a digestion
Just adds a simple check. I want to say there's a set src syntax for specific mob types? Or maybe 'x in oview(1)' or something idk. Whatever.
2017-02-28 10:28:37 -05:00
Screemonster
b1908e65db fun meme, but OP now invisible things actually work 2017-02-28 08:57:22 +00:00
izac112
20a87dfbd2 Path cleanup and some sprite and fluff updates 2017-02-27 20:19:42 +01:00
Screemonster
ef7e20c16a Adds nerdglasses 2017-02-27 01:51:19 +00:00
Arokha Sieyes
cf340c362a Raise limit on bellies
For ~~Tempest~~ anyone who wanted to have more than 10 like a *crazy person*
2017-02-25 20:45:44 -05:00
Arokha Sieyes
69097464ee Fix Tempest's Saddlebags, redo how Saddlebags Work
In the title!
2017-02-23 19:20:51 -05:00
Screemonster
5e47eaf7fe fixes battlerifle and unsc shotgun worn sprites 2017-02-22 21:28:04 +00:00
Arokha Sieyes
5b72365c48 Merge pull request #1006 from VOREStation/fluffstuff
More fluff changes
2017-02-22 10:31:57 -05:00
Arokha Sieyes
deeee616d1 More fluff changes
Some day I'll decide exactly what I want. That day probably isn't today, either.
2017-02-22 10:20:07 -05:00
killer653
63ae45159d Tempest item, saddle adjustments 2017-02-21 20:55:09 -05:00
Leshana
d4771b3544 Fix number of wire spools in vulpine belt and add to custom_items.txt 2017-02-19 18:40:29 -05:00
Kelshark
051b505e3c Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-02-19 12:12:17 -05:00
izac112
a408f5bc49 more flooooof and flooof update 2017-02-19 18:06:32 +01:00
Kelshark
8df7fcd10a Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	.gitignore
#	vorestation.dme
2017-02-18 09:40:18 -05:00
Arokha Sieyes
1efad3d5b9 More guns + permit renewal
Adds 2.5 new guns (one isn't finished yet, it's got weird code so it's going to take a bit). They 'eat' the ammo they're loaded with and destroy the casings. So, if anyone wants caseless ammo, look at how I did it here.

Also renews my permit. Haven't done it IC yet, but I'll just delete it and the gun until I have. (Gosh if you can trust me to not just spawn random guns for myself you can trust me to do that :V)
2017-02-15 20:17:15 -05:00
Screemonster
a7ae4fd4ab bugfix in anti-tamper proc 2017-02-13 01:42:33 +00:00
Kelshark
5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt
2017-02-12 00:32:26 -05:00
Arokha Sieyes
e027118e73 Merge pull request #931 from VOREStation/wingcolor
Sounds add for #205
2017-02-08 16:23:30 -05:00
Arokha Sieyes
d915ba6249 Sounds add for #205
A few more choices for those that prefer these. Basically the backpack-cloth-rustle noise, and a choice for no sound. Useful for those that have "taur back" or whatever bellies.
2017-02-08 13:17:35 -05:00
Arokha Sieyes
5ffd9fba4f Merge pull request #926 from VOREStation/wingcolor
Makes feathered wings colorable
2017-02-07 18:44:02 -05:00
killer653
b055158c0a Gives the hypospray a name 2017-02-07 18:01:06 -05:00
killer653
43a11821c5 Adds Tempest's syringe correctly
Fixes #897 correctly
2017-02-07 17:26:41 -05:00
Arokha Sieyes
715cd4dc7a Makes feathered wings colorable
Also makes them not hide your species tail, so if you're taj or unathi or whatever, your tail still shows up.

For #925
2017-02-07 14:23:14 -05:00
Arokha Sieyes
a37e7067d1 Renames fluff vials
People were getting a little scared at "Aronai begins loading vial (poisoned) into the hypospray" when it was antitoxin. x3
2017-02-04 23:49:10 -05:00
Kelshark
9ce88c8c6c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme
2017-02-03 21:35:22 -05:00
Arokha Sieyes
94b621b310 Merge pull request #893 from Cameron653/master
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Arokha Sieyes
380eee789d Merge pull request #899 from VOREStation/suitnerf
Nerf teleport rig
2017-02-02 22:59:29 -05:00
Arokha Sieyes
03b6697d04 Nerf teleport rig
Reduces the armor to less than that of the EMT suit, removes integrated O2 tank.
2017-02-02 18:38:58 -05:00
Screemonster
f8c121cbb9 adds recoloured phazon sprite for the scuttlebug 2017-02-02 13:24:55 +00:00