Commit Graph

29316 Commits

Author SHA1 Message Date
Verkister
56257b302a Merge branch 'gimmicktraits' of https://github.com/Verkister/VOREStation into gimmicktraits 2017-11-15 17:52:47 +02:00
Verkister
a5ff9415fa Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm
2017-11-15 17:52:15 +02:00
Spades
904899fcde Merge pull request #2477 from Verkister/plowthatnerd
Adds an inconveniently evil new negative trait.
2017-11-15 10:48:55 -05:00
Verkister
fb7ebab196 Update living.dm 2017-11-15 16:39:33 +02:00
Verkister
b4c707e591 Update living.dm 2017-11-15 07:56:01 +02:00
Verkister
f02f3b2846 Adds an inconveniently evil new negative trait.
-"Lightweight", cost -4, every non-helpful bump received has a 50% chance to knock you down.
2017-11-14 20:48:40 +02:00
Verkister
8c1fb156be Adds a cosmetic "armor vest" taur saddlebag subtype.
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
2017-11-14 16:18:47 +02:00
Verkister
fa48060644 darn capitalism 2017-11-14 09:43:52 +02:00
Verkister
a5e3ddd948 items cannot forcemove? 2017-11-14 09:42:38 +02:00
Verkister
ec413c1288 Update trash_vr.dm 2017-11-14 09:33:23 +02:00
Verkister
540901e359 Update neutral.dm 2017-11-14 09:23:08 +02:00
Verkister
03121273a6 Update positive.dm 2017-11-14 09:21:32 +02:00
Verkister
b5b41ab187 move ya feet 2017-11-14 01:17:06 +02:00
Verkister
2daec6bdc2 Update neutral.dm 2017-11-14 00:58:04 +02:00
Cameron653
9af1fa5065 Merge pull request #2472 from VOREStation/Cameron653-patch-2
Stop causing bots to kill everyone, jesus christ
2017-11-13 17:47:59 -05:00
Cameron653
de0ce9285d Stop causing bots to kill everyone, jesus christ 2017-11-13 17:38:19 -05:00
Cameron653
a37632e929 Prevents vatborns from spawning 2017-11-13 17:24:55 -05:00
Verkister
c1f16e080e Adds 2 neutral gimmick traits and borgo feeding.
-Trait 1, "Hard Feet" makes your feet glass shard resistant.
-Trait 2, "Trash Can" lets you dispose of snack wrappings on the go without littering or having to quest out in search of a disposal bin.
-Also adds trash feeding for janiborgo in a sibling snippet for the forementioned trait.
-Also added the old citadel era "robo kibble" to give the custom trash code file a first custom "trash" as well. Only in the code for now, not mechfab printable yet.
-I'm gonna toss Polaris an update that makes borgs not become sparkles on 0 force item paps brb.
2017-11-13 20:01:58 +02:00
Cyantime
ce21d46c7d Can't open blast doors with your face 2017-11-12 16:40:41 -05:00
Spades
c37c291c10 Merge pull request #2455 from VOREStation/Cameron653-patch-1
Loadout edits
2017-11-12 11:55:17 -05:00
Spades
0761203b90 Merge pull request #2444 from Cameron653/master
Makes it so nevreans can fly w/ default tail.
2017-11-12 11:52:03 -05:00
Spades
4de5f0b989 Merge pull request #2450 from Verkister/fuzzytoggle
Adds toggleable character pref for sharp/fuzzy scaling. (Tested.)
2017-11-12 11:49:29 -05:00
Spades
5cea42a2b8 Merge pull request #2440 from Verkister/orgurg
Makes HV at least somewhat feasible with organ nutrition.
2017-11-12 11:49:10 -05:00
killer653
3e2cf7c9b7 Makes stairs function as before
Video: https://i.imgur.com/EvqCQux.gifv
2017-11-12 01:15:33 -05:00
killer653
b1ce51c2b3 Adds in Drop Noms
Information to include in PR
Panel: https://i.imgur.com/Ru0Mb2w.png
Pred falling onto prey: https://i.imgur.com/Y28TaJn.gifv
Prey falling onto pred: https://i.imgur.com/DzZlQbr.gifv
Person falling onto person w/ unaligned prefs:
https://i.imgur.com/DzZlQbr.gifv
Pred falling onto prey does anywhere from 0 to 30 damage to the pred
Prey falling into pred does 0 damage to both.
Unaligned causes the faller to suffer damage & a stun, person being
fallen on gets stunned
Dropping onto someone w/ dropnom: https://i.imgur.com/PywIfAI.png
Dropping onto someone w/ dropnom: https://i.imgur.com/H7o5g9f.png
2017-11-12 00:32:54 -05:00
Cameron Lennox
4f289c84c6 Agh 2017-11-11 19:24:59 -05:00
Cameron Lennox
c9ee48b78f WIP 2017-11-11 19:24:35 -05:00
Verkister
b6d4686ba0 Update bellymodes_vr.dm 2017-11-11 17:07:28 +02:00
Verkister
09591d9395 It works now. 2017-11-11 16:00:37 +02:00
Cameron653
8714c006ff Update loadout_accessories.dm 2017-11-10 18:33:44 -05:00
Cameron653
d5e9f96493 Makes wallets (except for orange) free of cost 2017-11-10 18:29:44 -05:00
Cameron653
df89195c48 Makes tracking implant cost 0
For preds
2017-11-10 18:28:30 -05:00
Spades
70a33bde83 Merge pull request #2433 from Screemonster/feralfixmaybe
hunger feral tweak and bugfix
2017-11-10 16:37:28 -05:00
Spades
94d61dc02e Merge pull request #2430 from Verkister/previewscales
Preview nitpickery.
2017-11-10 16:37:08 -05:00
Spades
7a7e0f915c Merge pull request #2452 from Cameron653/master
Mid November Polaris Sync
2017-11-10 16:36:48 -05:00
Cameron653
6922dff544 typo fix 2017-11-10 14:28:50 -05:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Verkister
72edb34ecc Adds toggleable character pref for sharp/fuzzy scaling.
-Yeah you should now be able to choose how you look.
-Especially benefitical for any character scaled to those atrociously fucked up deformation ranges.
-Can't really test it properly though due to the compile nature of the good ol' PIXEL_SCALE line in dm and my compy somehow forcing fuzzy on for some reason anyway. (my laptop's got the sharp mode tho)
-Kinda based on #1947 Go there for preview examples.
2017-11-10 12:19:31 +02:00
Anewbe
1b6a4597e7 Merge pull request #4246 from MarinaGryphon/IE-Fixes
Integrated Electronics fixes.
2017-11-09 21:22:35 -06:00
Anewbe
6b6683ef74 Merge pull request #4236 from Mechoid/Flamethrower_Expansion_2
Species Sprites for the Firebug voidsuit.
2017-11-08 13:25:18 -06:00
Cameron653
9b467a488d fixes #2431
fixes #2431
2017-11-08 14:11:15 -05:00
Marina Gryphon
8b311ac237 Reverted some changes, apparently it was already fixed. 2017-11-08 09:28:29 -06:00
Marina Gryphon
5af691093e Re-fixed an issue with power transmitters. 2017-11-08 09:22:03 -06:00
Marina Gryphon
c755edda5b Removed a file I didn't mean to commit. 2017-11-08 08:37:16 -06:00
Verkister
7b145097e7 Update bellymodes_vr.dm 2017-11-08 16:34:35 +02:00
Marina Gryphon
091c58ec68 Fixed some IE bugs. 2017-11-08 08:33:07 -06:00
Verkister
badd59384f Makes HV at least somewhat feasible with organ nutrition.
-Yeah you don't even get a single food bite worth of nutrition if your victim dies.
-This balances that some by giving severed organs an actual nutritional value instead of garbage treatment.
2017-11-08 16:31:41 +02:00
Verkister
e9c61e640e organ buff 2017-11-08 09:50:17 +02:00
Verkister
b563c44e3f nerfed to half. 2017-11-08 09:34:56 +02:00
arsserpentarium
1a1c10c3f8 circuitry upgrade pt 2 (#4213)
* 1.All reagent containers are acidproof now and have pin with self reference(to make it more easy to link them)
2.reagent scaner. It's like a beaker. But can give a list of contained reagents.
3.reagent filter. Pump,that can transfer only desired reagents,or all,except unwanted.
4.fuel cell.Converts chemicals to energy.
5.2 pins memory circuit. Sometimes it is very useful.
6.pulse demultiplexers. A lot like regular demultiplexer. But it doesn't distributes data. Just sends pulse to given activator pin.
7.list operations. choose element by index. write element by index. delete element by index search desired element in list. lenght of list.
8.strings: find element in string. explode string by delimeter.

* athsmos sensors back.

* fix
2017-11-07 22:54:56 -06:00