Commit Graph

6622 Commits

Author SHA1 Message Date
Fox McCloud
2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Sam
6e995515ff whoops 2017-08-04 06:20:58 +01:00
Crazy Lemon
59a9df3762 Merge pull request #7906 from Fox-McCloud/remove-cael
Removes Unused Xenoarch Code
2017-08-01 22:15:22 -07:00
Crazy Lemon
c85acf0a81 Merge pull request #7875 from Fox-McCloud/sound-update
Sound Update/Refactor
2017-08-01 22:09:46 -07:00
Fox-McCloud
6bd0d17527 performance 2017-07-31 14:01:15 -04:00
Fox-McCloud
c6465f5be7 yep, still need this 2017-07-29 20:41:38 -04:00
Fox-McCloud
968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Fox-McCloud
38edeada02 Chem Grenades Log Reagents 2017-07-28 00:56:37 -04:00
Aurorablade
04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -04:00
Fox-McCloud
f78c507122 Sound Update/Refactor 2017-07-25 20:35:38 -04:00
Fox-McCloud
81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Fox McCloud
98ad0cdb76 Merge pull request #7523 from FlattestGuitar/no-stel-ples
Removes boring theft objectives
2017-07-25 14:55:37 -04:00
Crazy Lemon
e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
Fox McCloud
d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Crazy Lemon
da7bea7c61 Merge pull request #7850 from Fox-McCloud/reagenttssss
Reagents Cleanup
2017-07-25 03:43:17 -07:00
Crazy Lemon
e574c84935 Merge pull request #7858 from Fox-McCloud/health-implant-fix
Fixes Health Implants
2017-07-25 03:39:32 -07:00
Fox-McCloud
5d2429e15f Merge remote-tracking branch 'upstream/master' into reagenttssss 2017-07-25 06:31:11 -04:00
Crazylemon64
9c86d07252 Adds decorative telecomms machinery for map making 2017-07-23 21:08:10 -07:00
Fox-McCloud
89ff21c755 Fixes Health Implants 2017-07-23 17:26:37 -04:00
Fox-McCloud
4419683890 Reagents Cleanup 2017-07-22 05:18:13 -04:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Crazylemon64
88edf50be3 Agh why did it stick spaces in there 2017-07-21 22:45:20 -07:00
Crazylemon64
e0178ff8fd Final changes 2017-07-21 22:27:50 -07:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Fox McCloud
c1087a6250 Merge pull request #7829 from Kyep/ts_blood_fix
Fixes #7826 & #7809 - blood decals being unanchored
2017-07-22 00:29:59 -04:00
Crazylemon64
50d5e18ef6 Moves soap into a single file 2017-07-21 15:20:23 -07:00
Crazylemon64
807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
Fox-McCloud
1ecd7f13fc instant updates 2017-07-21 02:19:12 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
tigercat2000
2f7254d19e Merge pull request #7802 from Fox-McCloud/gunshot-splatter
Adds Gunshot Blood Splatter
2017-07-19 14:21:52 -07:00
tigercat2000
e0dad32b50 Merge pull request #7806 from Fox-McCloud/FUCK-YOUR-CUNT-YOU-SHIT-EATING-CUNT-TILL-YOU-ARE-A-MASS-EATING-SHIT-CUNT-EAT-PENISES-IN-YOUR-FUCK-FACE-AND-SHIT-OUT-ABORTIONS-TO-FUCK-UP-SHIT-IN-YOUR-ASS-YOU-COCK-FUCK-SHIT
Removes Bay's Wound System
2017-07-19 14:13:49 -07:00
Kyep
a3ea959bc1 Fox request 2017-07-19 04:54:23 -07:00
Kyep
84bdc87cb7 Fixes #7809 - Makes /obj/effect/decal/cleanable anchored instead 2017-07-18 22:55:39 -07:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
FlattestGuitar
ead42d5a27 Merges conflicts 2017-07-16 23:58:43 +02:00
Crazylemon64
3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud
cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -04:00
KasparoVy
9104506a2a Vamp Shapeshift/DNAScrambler Fixes & Desnowflakes Prefsetup
Fixes a bug with Vampire Shapeshift where you didn't get a name appropriate to your species and clarifies that you won't be taking on another species using this ability.
Ensures you won't be taking on another species using this ability by circumventing an exploit whereby someone could change their species in game preferences, shapeshift, and be another species.
Fixes a bug with DNA scramblers whereby you wouldn't get a name appropriate to your species. Adds marking resetting for consistency.
Desnowflakes preferences_setup.dm like I had done with preferences.dm.
2017-07-15 09:58:26 -04:00
Fox-McCloud
3deaf6ece8 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-15 06:20:26 -04:00
Fox-McCloud
6d38ed3d90 colors 2017-07-15 05:40:14 -04:00
Fox-McCloud
88cc556c4f Adds Gunshot Blood Splatter 2017-07-14 11:26:15 -04:00
Fox-McCloud
599c686e9c Removes Cryostasis Bags 2017-07-13 22:21:54 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
tigercat2000
7819994f92 Merge pull request #7762 from Fox-McCloud/blood-refactor-fixes
Blood Refactor Fixes
2017-07-13 14:37:07 -07:00
Fox McCloud
7626942fce Merge pull request #7724 from shazbot194/Honk
Adds in the Jolly Jug
2017-07-12 23:26:51 -04:00
Fox-McCloud
ac32b14910 fix 2017-07-12 03:52:56 -04:00
Fox-McCloud
e02946f3e7 Blood Refactor Fixes 2017-07-12 02:14:53 -04:00
Fox-McCloud
511a8a37b6 Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye 2017-07-11 17:13:47 -04:00