Commit Graph

29125 Commits

Author SHA1 Message Date
Cameron Lennox
c99e7b51da Changes the knockout checks to incap all.
Also stops micro interactions while flying.
2017-10-29 11:30:43 -04:00
killer653
28e75a89aa Makes incap checks more extensive. 2017-10-28 21:28:56 -04:00
killer653
27c16465ac Forgot H. 2017-10-28 21:02:24 -04:00
killer653
8938620fd3 Adds some stop_flying procs. 2017-10-28 21:01:36 -04:00
killer653
884e80cd7d Checks for incap instead. Prevents floating on tiles 2017-10-28 20:29:07 -04:00
killer653
e9585bfc6d Allows flight with wings. 2017-10-28 19:51:14 -04:00
Spades
fe812c9f87 Merge pull request #2371 from Verkister/nastiness
New gurgle contamination system.
2017-10-28 11:18:50 -04:00
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
Belsima
8542fcde97 Success! 2017-10-27 13:43:05 -04:00
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule
Cyborg Language Module
2017-10-27 10:24:07 -07:00
Anewbe
bbcf264b0f Merge pull request #4169 from Belsima/equip
Minor outfit tweaks.
2017-10-27 11:45:40 -05:00
Cyantime
d98f9949c5 Missed a ) 2017-10-27 11:30:45 -04:00
Belsima
1f5c40106b weapon.dm fixes 2017-10-27 11:27:13 -04:00
Cyantime
2714be459a Minor drain and HV cleanup 2017-10-27 11:24:22 -04:00
Belsima
24a36295e3 Gives EMTs the appropriate EMT jacket. 2017-10-27 11:20:27 -04:00
Belsima
75b94df650 Gives T-Ray scanner to CE and Atmos. 2017-10-27 11:17:40 -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
Neerti
2c8d0f5ac8 Merge pull request #4156 from Anewbe/outfit_tweaks
Adjusts outfits again
2017-10-26 19:56:43 -04:00
Neerti
d15e36229f Merge pull request #4165 from Anewbe/id_fix
Fixes the access config issue
2017-10-26 19:51:54 -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
Anewbe
65eb398677 Fixes the access config issue 2017-10-26 17:34:15 -05: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
a5547daee8 Merge pull request #4155 from Anewbe/emp_grenades
Corrects the grenades in the ion weapon crates
2017-10-26 11:00:32 -07: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
Verkister
78efa41737 whoop 2017-10-26 19:15:30 +03:00
Verkister
f059fd2704 New gurgle contamination system.
-Added a new type of dedicated contamination proc for gurglestuffs.
-New gurglecontamination can have different outcomes depending on item.
-New soggy overlay with stink lines lmao.
-Also affects the items' name and flavor text until washed.
-Washable in regular sinks too.
-Affects a whole lot of more items than the phoron contamination with the ability of decontaminating without washing machine.
-Also made gurgled "holder" items (picked up mobs like mice, micros, and monkeys) drop their mob into the belly instead of just poofing out of existence with it.
2017-10-26 19:13:49 +03: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