Commit Graph
593 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub 5430454c73 Update magweapon.dm 2019-04-28 23:59:29 -04:00
TrilbyspacecloneandGitHub d136d95743 Update magweapon.dm 2019-04-28 23:56:39 -04:00
TrilbyspacecloneandGitHub b51751dfa8 Update magweapon_energy.dm 2019-04-28 23:38:34 -04:00
TrilbyspacecloneandGitHub c5f3f67824 Update magweapon.dm 2019-04-28 23:33:31 -04:00
TrilbyspacecloneandGitHub 514e15ee6c Update magweapon.dm 2019-04-28 23:32:38 -04:00
Useroth e51cdf98b2 Fixed the calibers up. 2019-04-29 04:58:26 +02:00
TrilbyspacecloneandGitHub 22912832d7 Create magweapon_energy.dm 2019-04-28 22:46:50 -04:00
TrilbyspacecloneandGitHub bc251b59aa Update magweapon.dm 2019-04-28 22:43:01 -04:00
TrilbyspacecloneandGitHub f6bb8b6aef Update magweapon.dm 2019-04-28 22:33:58 -04:00
TrilbyspacecloneandGitHub 9ff3918ffd Update magweapon.dm 2019-04-28 22:25:19 -04:00
TrilbyspacecloneandGitHub ad2cacb59e toys 2019-04-28 22:05:53 -04:00
TrilbyspacecloneandGitHub fb7a129ca5 Update magweapon.dm 2019-04-28 21:56:48 -04:00
TrilbyspacecloneandGitHub 3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
TrilbyspacecloneandGitHub bec3cf8967 Update magweapon.dm 2019-04-28 21:24:45 -04:00
TrilbyspacecloneandGitHub 0fa3fb6aca Update magweapon.dm 2019-04-28 16:46:12 -04:00
Useroth c59cb823bb Let's try like this. 2019-04-28 21:14:11 +02:00
TrilbyspacecloneandGitHub b7b4bf1a61 Update magweapon.dm 2019-04-28 14:51:53 -04:00
kevinz000andGitHub f38546b21a Merge pull request #8230 from Trilbyspaceclone/patch-97
[Ready] Makes Mentor chat have better colors as not to confuse Mentors from chat vs helping
2019-04-20 16:40:09 -07:00
kevinz000andGitHub 901e748675 Merge pull request #8254 from Poojawa/the-great-vore-escape
clears blindness on vore OOC escape
2019-04-20 16:31:59 -07:00
kevinz000andGitHub 60bc278418 Merge pull request #8227 from Trilbyspaceclone/patch-96
Magrifle/Magpistol nonlethals now do 2 damage rather than 0
2019-04-20 16:30:58 -07:00
Poojawa 1f65b1ebdd clears blindness on vore OOC escape 2019-04-17 01:27:08 -05:00
BurgerLua 7ff2b6817b No more seperate whatever 2019-04-16 21:06:57 -07:00
fdd0eb4b17 Update modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm
Co-Authored-By: BurgerLUA <BurgerLUA@users.noreply.github.com>
2019-04-16 15:40:55 -07:00
BurgerLua d49178fd84 Removed debug code, made the arousal input just be a flat value. 2019-04-16 12:10:03 -07:00
BurgerLua dba2b6deaf Tweaks Electric Stimulator + Adds Bonermeter 2019-04-16 11:55:54 -07:00
deathride58andGitHub 530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails
Fixes missing tail wag states
2019-04-15 10:01:45 -04:00
deathride58andGitHub c6ef9da679 Merge pull request #8239 from Citadel-Station-13/kevinz000-patch-36
Virgo hairs are now sorted better
2019-04-15 10:01:13 -04:00
Poojawa ba2884d2c7 Fixes missing tail wag states
Also sorts the accessories file a bit more again
2019-04-13 22:01:55 -05:00
deathride58andGitHub a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
kevinz000andGitHub 03ae39f95a Merge pull request #8232 from Poojawa/voremobs
Vore capable simple mobs & fixes
2019-04-13 00:21:42 -07:00
kevinz000andGitHub a14092e138 Merge pull request #8216 from Poojawa/lewd-dna
Adds DNA to semen puddles
2019-04-13 00:19:20 -07:00
kevinz000andGitHub 4bc28596c5 Update sprite_accessories.dm 2019-04-12 16:06:46 -07:00
Poojawa c69b0054c8 lavaknights are taur capable now 2019-04-12 04:38:32 -05:00
Poojawa fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa 4dcbaa8c80 Refractors simple mob vore code, enables vore mobs
also just removes the mistake that was hunger sounds.
2019-04-11 11:15:25 -05:00
Poojawa 45b8889562 Devourable mobs are digestible again 2019-04-11 07:13:19 -05:00
TrilbyspacecloneandGitHub 0b58285b53 5 - > 2 2019-04-11 00:36:31 -04:00
TrilbyspacecloneandGitHub b3e61f02bc brown from green 2019-04-11 00:11:18 -04:00
TrilbyspacecloneandGitHub 02f8f89a79 Update magweapon.dm 2019-04-09 09:52:05 -04:00
TrilbyspacecloneandGitHub 079dd582b8 Update magweapon.dm 2019-04-09 01:26:32 -04:00
kevinz000andGitHub a4a1f77c0f Merge pull request #8220 from Poojawa/master
fixes floaty-leg syndrome for xenos and random color issues
2019-04-07 15:13:00 -07:00
kevinz000andGitHub a4e01f2118 Merge pull request #8214 from Poojawa/loadout-fixes
Loadout items are forced to backpacks, fixes Security Officer Navy uniform
2019-04-07 14:49:04 -07:00
Poojawa 294349125e fixes floaty-leg syndrome for xenos
also fixes random gen colors from bugging out, idk why it was working just fine before but whatever
2019-04-06 16:32:29 -05:00
deathride58andGitHub 6259210a33 Merge pull request #8198 from Poojawa/Randomize-tweaks
Species Spawn tweaks and tauric plasmaman suit icons
2019-04-05 20:11:59 -04:00
Poojawa f6988a2a1c Adds DNA to semen puddles
Consistency's sake, I guess.
2019-04-05 18:42:22 -05:00
Poojawa 74169ca959 Fixes Navy officer uniform re-ports #7515 2019-04-05 15:08:04 -05:00
Poojawa 906efb8b48 wah alt and travis restart 2019-04-05 05:55:29 -05:00
Poojawa ebc9c6d8f0 attempts to make slime sprites equally transparent
also gives them snouts and markings for improvments
2019-04-04 22:01:52 -05:00
Poojawa 1cbb31c4d2 reeee 2019-04-04 19:27:47 -05:00
Poojawa d39dbf5c4c corrects a few markings, ensures human tails have more options 2019-04-04 14:43:58 -05:00