Kelshark
69349de63a
Merge branch 'master' of https://github.com/Repede/YawnWiderStation
2017-09-03 12:49:35 -04:00
Kelshark
5ee893eda1
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules_vr.dm
# config/custom_items.txt
# maps/tether/tether-03-station.dmm
# vorestation.dme
2017-09-03 12:49:08 -04:00
izac112
7f4affbb73
More fluff and language fix
2017-09-02 17:34:36 +02:00
Spades
c89512940f
Merge pull request #2089 from Verkister/ghostboop
...
Adds a ghost verb to alert blank pAI cards.
2017-09-01 18:11:20 -04:00
Verkister
f47db4995b
Adds a ghost verb to alert blank pAI cards.
...
-The verb causes available empty pAI devices to briefly flash an alert on their screens.
-Didn't add the sound part due to spam protections failing for the sake of annoyance prevention. Just gotta hope someone walks right past when ya do it.
-You can now indicate the things might actually be of use for once without having to resort to metabegging.
2017-09-01 12:52:52 +03:00
Dwaggy
72a64d2ef4
Changes to borg.
...
I did a derp apparently
Xenomaid gets access to service radio
Blade radio access changed to supply
Blade access to flashs removed.
2017-08-31 23:02:03 +01:00
Yoshax
19c047a4ae
Removes whitelist requirements from Daemon and Enochian
2017-08-31 22:33:31 +01:00
Spades
4812374d56
Merge pull request #2076 from AaronSherwood117/master
...
Adds Handshakes and Head Patting
2017-08-29 14:37:08 -04:00
Spades
cc75893ba2
Merge pull request #2073 from Cameron653/master
...
Late August Polaris Sync
2017-08-29 13:54:55 -04:00
Aaron Sherwood
507bd3e708
Add Headpats and Handshakes
...
Thanks to Cameron for helping get this working. Been way too long since
I started trying to learn DM.
Target either hand or the head on help intent (with an empty hand) and
you can now perform classic human greetings and/or pet people!
2017-08-29 05:40:00 -05:00
Spades
7ca531181b
Merge pull request #2075 from Funce/dev/borg-assorted-fixes
...
Medical Borgs Assorted Fixes
2017-08-29 04:13:20 -04:00
Funce
c0d28be09f
Changes comments to be more find-friendly
2017-08-29 19:10:27 +12:00
Funce
292f045733
Changes Comment to be more Find-friendly
2017-08-29 19:06:05 +12:00
Funce
13d64875ff
Finally fixes borg OOC prefs
2017-08-29 14:41:10 +12:00
Funce
b329860e50
Adds crew monitor to medihound
2017-08-29 14:38:20 +12:00
Funce
bf259427ca
Fixes medical borgs being unusable
2017-08-29 14:37:50 +12:00
Dwaggy
b488668696
Added back crowbars to Medihound, Added defibs to medhound, changed beaker to a large one.
...
Added new borg (basicly a combination of surgery with dogborg stuff), inactive however until we can decide on final modules.
2017-08-29 03:15:28 +01:00
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
Anewbe
0c89df05f6
Should make prometheans playable
2017-08-27 14:24:47 -05:00
Spades
df37726669
Merge remote-tracking branch 'refs/remotes/origin/master' into oties-and-wild-removed
2017-08-26 15:51:47 -04:00
Spades
18ffeefafd
Removies oties and outdoors area
2017-08-26 15:51:37 -04:00
Kelshark
9731980d65
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-08-26 00:20:09 -04:00
Verkister
20e2b78963
Proper shutdown for borgo refreshing.
2017-08-24 15:56:52 +03:00
Verkister
1d266509ae
Auto-updates for vore panel and borgo gut UI.
...
-Vore panel now automatically refreshes when belly contents enter or leave.
-Updates only happen when the panel is open.
-Should also work from the prey's perspective.
-Borgo sleeper UI also does that now.
-Clicking the borgo gut while active toggles the UI updates.
-Hacky shit lmao but I need to pass out again like 2 hours ago so goodnight.
2017-08-24 02:46:57 +03:00
Belsima
a11bc0b9db
Adds Teshari sneezing noises.
2017-08-23 03:08:10 -04:00
Kelshark
4e92af7d77
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-08-22 08:00:37 -04:00
Kelshark
f2f35697fb
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/datums/supplypacks/engineering.dm
# code/modules/mob/living/silicon/robot/robot_modules_vr.dm
# code/modules/vore/appearance/spider_taur_powers_vr.dm
# code/modules/vore/resizing/resize_vr.dm
# config/custom_items.txt
# icons/mob/vore/taurs_vr.dmi
2017-08-18 08:14:12 -04:00
Neerti
a08f93481f
Merge pull request #3713 from Belsima/batterup
...
Adds positronic bootup noises.
2017-08-17 12:01:43 -04:00
Neerti
ea353410d3
Merge pull request #3719 from Cyantime/simplemobiconorder
...
Fixes dead simple mobs keeping their resting icon.
2017-08-17 11:59:53 -04:00
Cyantime
6958306b60
Gives dead icon priority over resting icon.
2017-08-16 17:09:34 -04:00
Cyantime
abc826320e
Safer vent selection for spawned mice.
2017-08-16 16:57:18 -04:00
Belsima
fcb471af20
Adds positronic bootup noises.
2017-08-15 23:03:35 -04:00
Cyantime
499862bca6
Configurable mob spawners, re-implementation of trash mouse spawning.
2017-08-15 22:09:53 -04:00
Anewbe
7d7bc4cde6
Merge pull request #3705 from Cameron653/master
...
Modifies 1 time PAI sprite&speech selection.
2017-08-15 18:31:20 -04:00
Spades
35c6cbd8b5
Merge pull request #2017 from Cyantime/catbuff
...
Buffs cat mouse-catching capabilities.
2017-08-15 00:08:47 -04:00
Cyantime
9f268bca33
Buffs cat mouse-catching capabilities.
2017-08-14 21:36:31 -04:00
Kelshark
60c28b9074
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/vore/appearance/sprite_accessories_vr.dm
# config/custom_items.txt
# icons/mob/vore/taurs_vr.dmi
2017-08-14 17:27:13 -04:00
killer653
e59bb743c7
Fixes spider hair&markings
2017-08-14 16:32:55 -04:00
Cyantime
9a6b86cb9b
Stop poisoning yourself
2017-08-14 02:22:42 -04:00
Cameron653
010dce2056
Merge pull request #2007 from Cameron653/SPIDER_RACE
...
Fixes a gamebreaking oversight related to spider and xenochimera age.
2017-08-14 02:02:10 -04:00
Cameron653
0ba9752202
Forgot to change these when I initally copy and pased them.
2017-08-14 01:13:40 -04:00
Spades
e0db8feb50
Merge pull request #1996 from Cameron653/SPIDER_RACE
...
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Cameron653
38a496cfb4
Update station_special_vr.dm
2017-08-13 10:42:15 -04:00
Spades
2e22e7fd08
Merge pull request #1994 from Cameron653/MEDICAL_SLEEVEMATE
...
Lets medical borgs scan people.
2017-08-13 05:17:10 -04:00
Spades
cf00011e73
Merge pull request #1987 from Verkister/spriteshit
...
Accessory blend mode overhauls and some synth taurs.
2017-08-13 05:17:01 -04:00
killer653
2104cfde9a
Blurb update
2017-08-12 23:54:10 -04:00
killer653
63c496e79c
FIXES
2017-08-12 23:49:24 -04:00
Cameron653
d1de17240c
Updates their name
2017-08-12 23:43:57 -04:00
killer653
32ee9af282
Adds spider-eyes
2017-08-12 23:17:59 -04:00
killer653
dc828eaab0
Spiders!
2017-08-12 23:02:38 -04:00
