Commit Graph

17956 Commits

Author SHA1 Message Date
izac112
7f4affbb73 More fluff and language fix 2017-09-02 17:34:36 +02:00
Kelshark
1d0a2e0772 Tail stuff and removed dumb ass paper in HoS office :ree: 2017-09-02 00:42:22 -04:00
Repede
b5306b087e Merge pull request #58 from Repede/Izac
Finished the armooooors
2017-09-02 00:41:18 -04:00
izac112
a833cde9fb Now with fluff 2017-09-02 01:13:53 +02:00
Dwaggy
29c4e4dfd4 -Fixed Bicard - goddamn capital letters.
-Added kelotane to Dogborg hypo. (reasoning been that the med belly is capable of making it too. so pulling from the same pool of reserves, allowing for basic med healing for those that refuse to be mednomed.
-Due to the extra flexibility of the hypo, I've also brought the power cost of using it up in line with the medbelly, before, each 'charge' of hypo would cost a measly 50 power. now costs 325 per recharge. (325 per 5u, as opposed to medbelly 750 per 10u, working to exactly half and half, leading to no loss or gain in power by preferring one method over another.)

-Due to the extra cost in power of the hypo from something negligible to something that can quickly drain the basic borg cells, added in a check to stop it draining power/recharging once the cell hits around 800 + the cost of each recharge. (which is about the same as the medical belly checks, ends up around 1000 charge) once under this amount, the hypo will stop costing power and recharging its 30u storage. stopping it from killing the borg off, allowing them a large enough pool of energy to return to the nearest borg charger.
2017-09-01 17:37:19 +01:00
izac112
e1401cb145 Finished the armooooors 2017-09-01 16:40:16 +02:00
Dwaggy
89c7bfd616 Added Bicaridine to the dogborg hypo synthersizer.
The medbelly can already produce this, and is probably the most important chemical of all of them
seems odd that it wouldnt be able to push it from medbelly to hypo,
for those people that refuse to be mednommed.
2017-08-31 23:36:51 +01: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
Kelshark
8ba4af1037 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-08-28 23:03:31 -04:00
Kelshark
3120de04a4 Madoka armor sprite update 2017-08-28 23:01:50 -04: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
Kelshark
27eb2f7a31 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-08-26 00:20:22 -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
izac112
d704e1b751 Cig fix and some prep 2017-08-26 02:52:45 +02:00
Spades
cc6e0ce96b Merge pull request #2058 from VOREStation/WING_DESIGNER_FIX
Should fix designer tails being unselectable.
2017-08-25 01:24:21 -04:00
Spades
668078ed08 Merge pull request #2054 from Verkister/spampanels
Auto-updates for vore panel and borgo gut UI.
2017-08-25 01:24:10 -04:00
Spades
26d52b576a Merge pull request #2026 from Gearshy/master
Shock collars now come with exciting shocking action!
2017-08-25 01:23:11 -04:00
Spades
a43c1d408c Merge pull request #2037 from Cameron653/master
Adds Xenneth custom ID.
2017-08-25 01:23:01 -04:00
Cameron653
947b38a7f1 Should fix the wings 2017-08-24 22:43:55 -04:00
Verkister
f846437db5 I think I figured out the shuttle issue.
-No, the line 84 did not replace or relate to the timer part you commented out.
-Due to condition mismatch of some sort, the code skipped the line 84 stuff, moving onto the next thing below, slapping the shuttle through instantly because of the timer having been commented out
2017-08-24 21:23:39 +03: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
Kelshark
4e92af7d77 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2017-08-22 08:00:37 -04:00
killer653
eb48f05509 Adds Xenneth custom ID 2017-08-20 21:28:16 -04:00
izac112
d4e3882568 aand this 2017-08-19 18:45:17 +02:00
izac112
e78cef5fc9 Fixes fluff being in the loudouts 2017-08-18 17:11:28 +02: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
Gearshy
c19a3c648d Collar icons 2017-08-16 21:11:31 +02:00
Gearshy
a148ffed55 Final-ish pass on shock collars. 2017-08-16 20:50:34 +02:00
Gearshy
42801b9abc Shock Collars: The Empire Strikes Back 2017-08-16 18:07:07 +02:00
Gearshy
652749a0b8 Part four of the shock collar saga, and more cleanup. 2017-08-16 16:16:48 +02:00
Gearshy
31de112699 Third time is the perfect time for minor cleanup. 2017-08-16 15:02:08 +02:00
Gearshy
e0f373efd3 Shocking collars, take two. 2017-08-16 14:33:38 +02:00
Gearshy
34a025e1d2 Shock collars, how SHOCKING! 1/? 2017-08-16 14:00:20 +02:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Spades
0d5bc38ddf Merge pull request #2015 from Verkister/feedtheborgo
Enables vore organ borgo fueling.
2017-08-15 01:22:35 -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
Verkister
fe6cf21850 Enables vore organ borgo fueling.
-Borgs now gain recharge juice from vore organ gurgles.
2017-08-15 00:19:06 +03:00
killer653
e59bb743c7 Fixes spider hair&markings 2017-08-14 16:32:55 -04:00
Spades
2dfe50bc1b Merge pull request #2008 from Cyantime/decontam
Contaminated items no longer deal damage if they are in a belly.
2017-08-14 04:16:45 -04:00
Spades
0a808a5cb4 Quick text hotfix 2017-08-14 04:04:51 -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
Spades
0d24be30ea Merge pull request #2002 from Yoshax/1234
Fixes Promethean Humans looking really, really bad
2017-08-13 20:55:19 -04:00
Yoshax
b3c2cea59c Fixes Promethean Humans looking really, really bad 2017-08-13 21:48:41 +01:00
Cameron653
38a496cfb4 Update station_special_vr.dm 2017-08-13 10:42:15 -04:00