53520 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Novacat	97d63565fd	Merge pull request #8390 from Rykka-Stormheart/shep-dev-booze-traits ... Add Booze Traits!	2020-07-13 15:06:36 -04:00
Leshana	05c9b20b23	Merge pull request #8386 from VOREStation/upstream-merge-7328 ... [MIRROR] Move the vending machines into a separate file.	2020-07-13 14:40:19 -04:00
Leshana	f54c8f43bc	Merge pull request #8359 from VOREStation/upstream-merge-7318 ... [MIRROR] Fixes oversight closet decl name	2020-07-13 14:39:32 -04:00
Leshana	1e27088ca4	Merge pull request #8358 from VOREStation/upstream-merge-7268 ... [MIRROR] Ports Bay's lockers/cabinets/crates/etc	2020-07-13 14:38:47 -04:00
Leshana	34da89bc8d	Rename vending_vr to vending_machines_vr because vending_machines.dm is the file it is modifying.	2020-07-13 14:26:10 -04:00
Atermonera	e102a8c4c7	Move the vending machines into a separate file.	2020-07-13 14:23:39 -04:00
Novacat	d08316fb99	Merge pull request #8401 from VOREStation/upstream-merge-7330 ... [MIRROR] Species Vars Extension Pt2: Pain	2020-07-13 14:08:46 -04:00
Novacat	d015336882	Merge pull request #8399 from VOREStation/upstream-merge-7331 ... [MIRROR] Lite Security Uniform fix for Vox	2020-07-13 14:08:15 -04:00
Atermonera	851f40461f	Fixes oversight closet decl name	2020-07-13 14:08:00 -04:00
Atermonera	2444066b69	Merge pull request #7268 from VOREStation/Arokha/baylockers ... Ports Bay's lockers/cabinets/crates/etc	2020-07-13 14:06:49 -04:00
VirgoBot	c9997ceebb	Species Vars Extension Pt2: Pain	2020-07-13 12:09:57 -04:00
Killian	70e9c69ff3	pain_mod implementation (#7330)	2020-07-13 12:09:57 -04:00
VirgoBot	bcb58f6647	Lite Security Uniform fix for Vox	2020-07-13 12:08:40 -04:00
AdmiralDragon	add8840700	Lite Security Uniform fix for Vox (#7331) ... * Add files via upload * Add files via upload * Add files via upload * Add files via upload	2020-07-13 12:08:40 -04:00
Novacat	57639fdad4	Merge pull request #8391 from Rykka-Stormheart/shep-dev-instadrunk-fix ... Fix Slow Comfortable Screw Against the Wall	2020-07-12 14:54:25 -04:00
Rykka	0ae99a1407	Fix Slow Comfortable Screw Against the Wall ... The drink was set to strength = 0 resulting in a multiply by 0 and infinite alcoholism. You'd literally commit alcohol coma and instant liver death on drinking this.	2020-07-12 12:11:42 -04:00
Rykka	55e9bca231	Add Booze Traits! ... Upstream port of https://github.com/Yawn-Wider/YWPolarisVore/pull/619 Credit goes to @KillianKirilenko for this, I just ported this upstream and put all the traits in neutral.dm as per admin request! **Description:** This uses the universal alcohol_mod to allow for increasing/reducing the effects of ethanol based on the trait you've taken. Basically? You can get drunk more or less quickly. This does not change how fast you die when you start taking liver damage/tox, this only affects how fast alcohol makes you drunk.	2020-07-12 11:57:36 -04:00
Novacat	31f4f4a463	Merge pull request #8388 from Voidalynx/master ... Added Khanivore to Protean	2020-07-12 00:24:40 -04:00
Voidalynx	e2ddda44dc	Update alienwhitelist.txt	2020-07-12 03:21:50 +01:00
Novacat	ea80365a23	Merge pull request #8385 from Novacat/nova-basicfixes ... Translocator pref fix	2020-07-10 18:34:39 -04:00
Unknown	0cf3990f72	Translocator pref fix	2020-07-10 18:22:55 -04:00
Novacat	7b7ae47fb1	Merge pull request #8384 from VOREStation/Verkister-patch-1 ... Fixes vr monkeycube boxes getting extra monkeys	2020-07-10 15:45:36 -04:00
Verkister	31b4bc1a6a	Fixes vr monkeycube boxes getting extra monkeys ... Fixes sobaka/saru/sparra/wolpin cube boxes spawning with bonus 4 regular monkeycubes	2020-07-10 11:54:36 +03:00
Novacat	23967ce999	Merge pull request #8379 from VOREStation/upstream-merge-7324 ... [MIRROR] Add a random mech spawner (Not mapped in yet)	2020-07-09 23:33:24 -04:00
Novacat	90483ba481	Merge pull request #8362 from KillianKirilenko/kk-balls ... BALL!	2020-07-09 20:08:21 -04:00
Novacat	f07945ec4e	Update ripley.dm	2020-07-09 20:08:00 -04:00
Novacat	5b47aa2cf1	Merge pull request #8378 from VOREStation/upstream-merge-6799 ... [MIRROR] New book sprites + inhands	2020-07-09 20:06:44 -04:00
Novacat	68dd074905	Merge pull request #8382 from VOREStation/upstream-merge-7316 ... [MIRROR] Add Mechs damage & penetration thresholds along with other improvements.	2020-07-09 20:06:30 -04:00
Novacat	20749a4b63	Merge pull request #8381 from VOREStation/upstream-merge-7326 ... [MIRROR] Arrivals Shuttle Message Fix	2020-07-09 20:06:07 -04:00
Novacat	7f35924bfb	Merge pull request #8380 from VOREStation/upstream-merge-7325 ... [MIRROR] Fix runtime in projectile.dm, 664.	2020-07-09 20:05:37 -04:00
VirgoBot	763de84566	Add Mechs damage & penetration thresholds along with other improvements.	2020-07-09 19:37:28 -04:00
Kates	2d2e2e41db	Add Mechs damage & penetration thresholds along with other improvements. (#7316) ... * Indent some comments for ease of read * Edit the armor values to be more readable, also add radiactive and bio checks. * Add damage threshold and penetration thresholds. If you do not enough damage, it will simply bounce off consistently. Something that does 1 damage to a person would be so ridiculously nothing to a mech that it shouldn't achieve anything. - If you throw a pebble at a mech, it will probably do nothing unless decently good as a weapon. Additionally, your armor reduces the effectiveness of most attacks without a minimum of armor piercing. - A flat hit with an hammer might be damaging to a squishy human, but it would probably not be all that effective against armored outerskin. The damage will be reduced to 2/3 or x0.66 to remark on this. * Add a couple example values to the ripley and durand. * Move the value by which failed penetrations damage is reduced to. God this is a mouthful to say out loud. * Change the damage message from 'no denting' to 'bounces off' * Fix an indentation error * Small variable tweak.	2020-07-09 19:37:28 -04:00
VirgoBot	fd0b4d3317	Arrivals Shuttle Message Fix	2020-07-09 18:29:38 -04:00
Atermonera	a697e83ebd	Merge pull request #7326 from Neerti/arrival_announcement_fix ... Arrivals Shuttle Message Fix	2020-07-09 18:29:38 -04:00
VirgoBot	e10c4a6d62	Fix runtime in projectile.dm, 664.	2020-07-09 18:27:21 -04:00
Atermonera	3c16520a60	Merge pull request #7325 from Mechoid/FixTheStunShotsAgain ... Fix runtime in projectile.dm, 664.	2020-07-09 18:27:21 -04:00
Kates	e4389f170c	Add a random mech spawner (Not mapped in yet)	2020-07-09 18:13:36 -04:00
VirgoBot	1af24e855f	New book sprites + inhands	2020-07-09 17:33:58 -04:00
Schnayy	99a977ee3d	Merge pull request #6799 from Cerebulon/booksprites ... New book sprites + inhands	2020-07-09 17:33:58 -04:00
Novacat	b8d851ea59	Merge pull request #8376 from KillianKirilenko/kk-suits ... Streamlined Voidsuits: VR Species	2020-07-09 01:17:05 -04:00
Killian	2006d45647	expand #8372	2020-07-09 05:24:16 +01:00
Killian	02f97bdb74	Merge remote-tracking branch 'upstream/master' into kk-suits	2020-07-09 04:48:12 +01:00
Killian	9adf026d61	Update maintenance.dm	2020-07-09 04:43:32 +01:00
Novacat	c24e309f33	Merge pull request #8375 from VOREStation/upstream-merge-7323 ... [MIRROR] Mech tweak - Break move_inside() into a verb & proc.	2020-07-08 22:30:18 -04:00
Novacat	05175e1a4c	Merge pull request #8374 from VOREStation/upstream-merge-7321 ... [MIRROR] Fix Adv. Suit Belt	2020-07-08 22:29:59 -04:00
Novacat	87db25ae32	Merge pull request #8373 from VOREStation/upstream-merge-7322 ... [MIRROR] Add a forgotten strafing() call.	2020-07-08 22:29:40 -04:00
Novacat	5bad04efd2	Merge pull request #8372 from VOREStation/upstream-merge-7300 ... [MIRROR] Streamlined Voidsuits Upgrade	2020-07-08 22:29:24 -04:00
VirgoBot	577435b6d6	Mech tweak - Break move_inside() into a verb & proc.	2020-07-08 21:24:12 -04:00
Kates	96c8ea6090	Mech tweak - Break move_inside() into a verb & proc. (#7323)	2020-07-08 21:24:12 -04:00
VirgoBot	e6b018d046	Fix Adv. Suit Belt	2020-07-08 21:22:57 -04:00