Commit Graph

18648 Commits

Author SHA1 Message Date
Spades
db8a51cf98 Merge pull request #2380 from Cameron653/master
Polaris Sync
2017-10-28 11:18:35 -04:00
Spades
a983cc5882 Merge pull request #2358 from Verkister/nifting
Fixes initial nif backups.
2017-10-27 17:42:30 -04:00
Yoshax
0aeae047b1 Revert "Angry comments on color_mult vs color_add" 2017-10-27 22:09:03 +01:00
Verkister
fac7a6a974 Removes the flashlight stuffs. 2017-10-27 23:43:57 +03:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Spades
5778cc3f1e Merge pull request #2379 from VOREStation/tajaran-icon-fix
It's just comments.
2017-10-27 14:54:03 -04:00
Spades
7f9acb1fa0 Angry comments on color_mult vs color_add 2017-10-27 14:52:53 -04:00
Spades
64230d9726 Merge pull request #2376 from Cyantime/patch-1
Minor drain and HV cleanup
2017-10-27 14:32:35 -04:00
Cameron653
482e6e0722 Merge pull request #2374 from VOREStation/Cameron653-patch-1
Makes bloodbags have 10 uses.
2017-10-27 14:30:31 -04:00
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule
Cyborg Language Module
2017-10-27 10:24:07 -07:00
Cyantime
d98f9949c5 Missed a ) 2017-10-27 11:30:45 -04:00
Cyantime
2714be459a Minor drain and HV cleanup 2017-10-27 11:24:22 -04:00
Yoshax
714472bd08 Revert "Reverts tajaran blend conversion." 2017-10-27 14:42:11 +01:00
Cameron653
9eac4c3996 Update blood_pack_vr.dm 2017-10-26 23:49:25 -04:00
Cameron653
0a046e364a Makes bloodbags have 10 uses. 2017-10-26 23:13:02 -04:00
Neerti
b4597f06bd Merge pull request #4147 from Anewbe/footstep_tweaks
Adds a footstep volume modifier to shoes
2017-10-26 20:11:15 -04:00
Mechoid
8bfc040d97 Merge pull request #4158 from Anewbe/bloodloss_burn
Further decreases bloodloss from burn damage
2017-10-26 15:58:18 -07:00
Mechoid
9bc627d813 Merge pull request #4160 from Anewbe/bicaridine
Adds a cap to bicard overdose eye_blurry
2017-10-26 15:57:48 -07:00
Mechoid
e1eaec0add Merge pull request #4154 from Anewbe/footsteps_fix
Corrects the walking footstep play ratio
2017-10-26 15:31:23 -07:00
MisterLayne
436eaa1efb Adds language module. 2017-10-26 15:43:25 -04:00
Mechoid
05367ba8d9 Merge pull request #4152 from Anewbe/claustrophobia_nullcheck
Adds a nullcheck to the claustrophobia trait
2017-10-26 10:56:59 -07:00
Spades
6bc4b68e10 Merge pull request #2351 from Verkister/oldvox
Re-enables the old vox sprites.
2017-10-26 00:30:06 -04:00
Anewbe
49a0381546 Merge pull request #4153 from Neerti/10/24/2017_apc_lives_matter
Removes passive APC destruction from hacked SMES
2017-10-25 21:55:59 -05:00
Spades
1b5910b65f Merge pull request #2359 from Verkister/missinghisperiod
Fixes missing limbs showing no names and shit on custom species.
2017-10-25 21:11:19 -04:00
Spades
ce2e4b1c54 Merge pull request #2367 from Natje0/master
Adds Large Feathered wings
2017-10-25 21:09:34 -04:00
Spades
6dd44b58cb Merge pull request #2368 from Xsdew/master
Catwoman Markings
2017-10-25 21:09:20 -04:00
Spades
6cf8f56489 Merge pull request #2366 from Verkister/tajaddsfghjd
Reverts tajaran blend conversion.
2017-10-25 21:08:45 -04:00
Neerti
c56c87bbbe Merge pull request #4157 from Cyantime/patch-1
Decapitalizes a destination
2017-10-25 15:23:32 -04:00
arsserpentarium
0d0574ee3a First part of circuitry update. (#4143)
* 1.Fixed pathfinder circuit …
2.Hypo injector and pump now can be inversed if you nive negative amount.
3.Hypo injector and smoke generator has output pin with amount of stored liquid now.Also they have pulse out pins ,which will be activated after their work.
4.All reagent containers are acidproof now and have pin with self reference(to make it more easy to link them)
5.advanced locator. Like adjastent, but with adjustable up to 8 tiles radius and possibility to find items by name and desctiption.
6.drone capacity and complexity was raised.
7.Now you can wrench large assembly into place.
8.Adjastent locator have 2 pulse out pins. One will be activated if it find something, And one if doesn't
9.reagent scaner. It's like a beaker. But can give a list of contained reagents.
10.reagent filter. Pump,that can transfer only desired reagents,or all,except unwanted.
11.examiner. returns name,description ,relative coordiinates,distance,amount of reagents
12. Internal and external battery sensers. A lot like power monitor in transmission circuit. But without transmission. First returns state of assembly's own battety. Second returns state of any battery in view.
13.encoder/decoder of refs.To send refs throught EPV2
14.strings: find element in string. explode string by delimeter.

* all issues fixed
2017-10-25 12:54:50 -05:00
Ansari
952d4871d2 Playing card improvement - Take two (#4140)
* Card rework. For some reason won't run.

* Local man miss quotation mark. More at 12.

* Fix .dme.
2017-10-25 12:20:20 -05:00
Anewbe
804630382f Adds a cap to bicard overdose eye_blurry 2017-10-25 04:39:34 -05:00
Anewbe
03097fba80 Further decreases bloodloss from burn damage 2017-10-25 02:14:52 -05:00
Cyantime
1e9012b85a Decapitalizes a destination 2017-10-25 03:12:29 -04:00
Spades
2d9198780e Merge pull request #2350 from Verkister/unbrutal
Applies the gurgle damage scaling to borg gains as well.
2017-10-25 00:41:16 -04:00
Spades
8e549b8084 Merge pull request #2340 from Verkister/otiegrabs
Replaces live otie grabs with a different feature.
2017-10-25 00:40:59 -04:00
Neerti
98e94ddbf2 Merge pull request #4150 from Anewbe/betterMedAviators
Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout
2017-10-24 21:18:11 -04:00
Neerti
43e850b22e Merge pull request #4149 from Anewbe/aim_things
Can't aim at invisible things
2017-10-24 21:17:41 -04:00
Xsdew
4b6ff72f6d Catwoman Markings
This adds four new markings, all inspired from Felicia from Darkstalkers. The Catwoman chest,groin,left leg, and right left markings.
2017-10-24 20:12:22 -04:00
Anewbe
a29f386fd3 Corrects the walking footstep play ratio 2017-10-24 17:36:19 -05:00
Neerti
7079981d33 Removes APC destruction from hacked SMES 2017-10-24 18:11:01 -04:00
Anewbe
820f264055 Adds a nullcheck to the claustrophobia trait 2017-10-24 16:34:49 -05:00
Mechoid
4a61e59ea9 Merge pull request #4135 from Anewbe/infection_scaling
Level Two Infections actually hurt now
2017-10-24 09:55:30 -07:00
Anewbe
b915565655 Merge pull request #4145 from MisterLayne/GimmeDemMaterials_BORG
Ends organic bias.
2017-10-24 11:38:11 -05:00
Natje0
c2473bf948 Code for large angel wings 2017-10-24 13:47:43 +02:00
Verkister
1a097c71f1 Reverts tajaran blend conversion.
-Now sit down before I come there and actually destroy your crops, slaughter your cattle, and pollute your waters et cetera.
2017-10-24 14:30:32 +03:00
Cameron653
f30dfd4304 RIP AND TEAR 2017-10-23 22:39:39 -04:00
Anewbe
09ff4c1a3a Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout 2017-10-23 16:30:09 -05:00
Verkister
23811f4dab Fixes missing limbs showing no names and shit on custom species.
-Yeah found out the reason, pretty clear by logic after figuring it out, but still somehow functional for normal species apparently(itjustworks.jpg)???
-The stuff was relying on some sort of "descriptor" in the has_limbs list that does not seem to even exist.
-Adding this "descriptor" to custom species limbs list reliably fixed the issue on test runs.
-No fucking clue how the other species somehow manage without that thing however.
2017-10-23 20:56:32 +03:00
Neerti
ca84cd326a Merge pull request #4139 from Anewbe/nicknames
Adds the ability to choose nicknames
2017-10-23 13:37:34 -04:00