kevinz000
|
eb1c767ab7
|
Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
|
2019-06-08 01:24:36 -07:00 |
|
kevinz000
|
1ad200fcf4
|
Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl
Schoolgirl outfits for the loadout menu
|
2019-06-08 01:22:52 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Poojawa
|
67eb76b360
|
clarifies a few things
|
2019-06-06 18:56:26 -05:00 |
|
dtfe3
|
0b1da3f025
|
Update uniform.dm
|
2019-06-06 20:50:14 +02:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
kevinz000
|
cd38a29449
|
Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
|
2019-06-05 01:44:05 -07:00 |
|
Poojawa
|
25458fad63
|
I refuse to eat crow.
|
2019-06-02 08:40:51 -05:00 |
|
Poojawa
|
69b1373209
|
compile testing and tweaks
|
2019-06-02 08:06:16 -05:00 |
|
Poojawa
|
818ec19561
|
Working as intended, fixed a few other missing sprites
Started groundwork for multi-breasts and hidden balls.
|
2019-06-02 04:44:57 -05:00 |
|
Poojawa
|
17ad519f24
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess
|
2019-06-02 03:00:46 -05:00 |
|
CalamaBanana
|
a37f84fb9b
|
Ports RP Deer taur and adds Elf Ears to Mammals
Ports RP Deer taur and adds Elf Ears to Mammals
|
2019-06-01 17:28:17 +02:00 |
|
deathride58
|
9e35f91706
|
suggested changes from asky
|
2019-05-30 13:18:05 -04:00 |
|
deathride58
|
3feb11f12a
|
Ports the zulie cloak and blackredgold coat donor items from RP
|
2019-05-28 19:38:08 -04:00 |
|
Poojawa
|
2aa86157e1
|
Fixes rendering issues. Adds balls to be rendered
|
2019-05-26 04:52:31 -05:00 |
|
deathride58
|
4fc31f6322
|
Merge branch 'master' into fuckatmos
|
2019-05-25 15:34:06 -04:00 |
|
kevinz000
|
0dba89c4e7
|
Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
|
2019-05-25 11:51:17 -07:00 |
|
kevinz000
|
e434b9ceb5
|
Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
|
2019-05-25 11:30:18 -07:00 |
|
kevinz000
|
97609fb84e
|
Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad
Fixes species getting genitals at all if NOGENITAL'd
|
2019-05-25 11:13:55 -07:00 |
|
Trilbyspaceclone
|
3bf667ba36
|
Update magweapon_energy.dm
|
2019-05-22 12:42:28 -04:00 |
|
Trilbyspaceclone
|
005647d4f6
|
Update magweapon_energy.dm
|
2019-05-22 12:12:06 -04:00 |
|
Poojawa
|
25463f22b2
|
Fixes species getting genitals at all if NOGENITAL'd
Holy FUCK this code is bad.
|
2019-05-21 23:52:19 -05:00 |
|
kevinz000
|
74af355079
|
Merge pull request #8392 from Poojawa/donator-item-fixing
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
|
2019-05-20 23:30:28 -07:00 |
|
Carlen White
|
e77f30d803
|
Slight change for aphrodisiacs to use the new userlove style.
|
2019-05-21 01:39:00 -04:00 |
|
Carlen White
|
51f2a37e6e
|
Changed arousal message styling.
Now with less gaudy green.
|
2019-05-20 17:47:10 -04:00 |
|
kevinz000
|
626ede8464
|
Merge pull request #8367 from Poojawa/genital-improvements
[READY] Genital fixes and skintone sync [Adds erections[]
|
2019-05-19 22:47:01 -07:00 |
|
kevinz000
|
8ceec4271e
|
Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle
Simple Mob vore toggle works again
|
2019-05-19 12:46:13 -07:00 |
|
Poojawa
|
8dc5fccfa7
|
fixes darksabre stuff
adjusts naga sprite. need to make all suits transferred over.
|
2019-05-18 21:14:19 -05:00 |
|
kevinz000
|
77232cc4bb
|
Merge pull request #8365 from Poojawa/salt-inducer
[s] Increases salt 100 fold
|
2019-05-17 08:34:36 -07:00 |
|
Poojawa
|
4f75f68a5d
|
make hostile mobs gurgle people
|
2019-05-17 05:13:30 -05:00 |
|
Poojawa
|
b95bc24def
|
mission accomplished
|
2019-05-17 04:24:23 -05:00 |
|
deathride58
|
d855a7eb0d
|
Merge pull request #8332 from Useroth/collars-n-shit
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
|
2019-05-17 00:10:41 -04:00 |
|
Poojawa
|
e4ba220eb7
|
oh god, oh fuck. why
|
2019-05-16 14:10:31 -05:00 |
|
Poojawa
|
0b46794ce9
|
Increases salt 100 fold
|
2019-05-16 09:43:03 -05:00 |
|
kevinz000
|
a3114d830a
|
Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
|
2019-05-14 13:48:54 -07:00 |
|
Trilbyspaceclone
|
62e5037eab
|
Merge branch 'master' into patch-118
|
2019-05-12 02:03:32 -04:00 |
|
kevinz000
|
90c3e4b776
|
Merge pull request #8322 from Trilbyspaceclone/patch-117
Buffs mag-gun recharges speed
|
2019-05-11 22:18:29 -07:00 |
|
Trilbyspaceclone
|
38696f4997
|
Delete autolathe_designs.dm
|
2019-05-10 16:47:59 -04:00 |
|
BurgerLua
|
6df27ef2a3
|
Updated integrated circuits
|
2019-05-09 15:25:48 -07:00 |
|
Useroth
|
4355584833
|
Added them to loadout too.
|
2019-05-09 12:09:18 +02:00 |
|
deathride58
|
0d65e3d1ab
|
Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
|
2019-05-06 21:58:44 -04:00 |
|
deathride58
|
aaa06473b7
|
Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
|
2019-05-06 21:23:55 -04:00 |
|
deathride58
|
c926320902
|
Merge pull request #8320 from Citadel-Station-13/kevinz000-patch-50
adds a cell charge line to magrifle description because why would you not make energy guns display this reeeee
|
2019-05-06 20:18:55 -04:00 |
|
Trilbyspaceclone
|
dc4aa42525
|
Update magweapon_energy.dm
|
2019-05-05 06:35:32 -04:00 |
|
kevinz000
|
0bfac54070
|
Update magweapon_energy.dm
|
2019-05-04 23:16:27 -07:00 |
|
BurgerLua
|
1557c33008
|
Adds Penis Enlargement Pills
|
2019-05-02 14:55:04 -07:00 |
|
Poojawa
|
be0829af53
|
cleans up loadout screen, fixes some suits, tweaks a few digi hand-holes
|
2019-05-01 00:10:27 -05:00 |
|
kevinz000
|
cbc0607086
|
Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
|
2019-04-30 05:31:33 -07:00 |
|
kevinz000
|
709e3375ac
|
Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit
Adds a new trait that makes you immune* to Crocin and Hexacrocin
|
2019-04-30 05:28:55 -07:00 |
|