1669 Commits

Author SHA1 Message Date
Sishen 3fee680f39 rename flag is for pen, my mistake 2019-06-19 16:09:03 -04:00
Sishen 3211a199af trenchcloak 2019-06-19 15:57:47 -04:00
Ghommie 2d13a9f289 clothes burning only spam You of Your clothes 2019-06-19 03:41:48 +02:00
Ghommie d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
kevinz000 6149a44408 Merge pull request #8565 from SkullyRoberts/NudityPermit
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
2019-06-16 01:19:51 -07:00
kevinz000 1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
2019-06-16 01:16:12 -07:00
Sishen 9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen 4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Ghommie 79c4ce502e more pda skins. 2019-06-10 00:28:43 +02:00
Ghommie d2e216f2de tested fixed tested fixed tested. 2019-06-09 19:55:08 +02:00
Poojawa 69cefb604b just need to fine tweak gibs and we're gucci 2019-06-09 11:10:23 -05:00
Ghommie cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
Ghommie 7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
SkullyRoberts 30b8d8db1a Made the nudity permit cover genitals and boobs 2019-06-08 18:38:28 -04:00
Ghommie 480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02: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
kevinz000 c8435a5658 Merge pull request #8414 from Trilbyspaceclone/MASON
New M.A.S.O.N rig
2019-06-08 01:08:00 -07:00
SkullyRoberts 5a9269db73 removed duplicate hides_bulges 2019-06-07 12:56:25 -04:00
SkullyRoberts 1a5c487e22 Ported the nudity permit from RP and made it a loadout option 2019-06-07 12:37:37 -04:00
Poojawa c2cf8b28df KISS principal 2019-06-06 21:35:50 -05:00
Poojawa 2e42656b6d Revert "lel"
This reverts commit 9e01a078ec.
2019-06-06 19:40:08 -05:00
Poojawa 6b82c985ae Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
2019-06-06 19:39:22 -05:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-05 19:32:17 +02:00
Ghommie 0513f3464a one 2019-06-05 19:20:25 +02:00
Poojawa 11d10d3805 fuckit, I'm just gunna wholesale port from baycode I guess 2019-06-05 04:55:36 -05:00
kevinz000 3ab46405b8 Merge pull request #8489 from Coolgat3/tacticalwear
Makes combat gloves look T A C T I C O O L
2019-06-05 01:49:57 -07:00
Poojawa 9e01a078ec lel 2019-06-03 20:06:25 -05:00
Poojawa 1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -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
kevinz000 70bad08f95 Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
2019-05-31 19:23:03 -07:00
kevinz000 59e88e0808 Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
2019-05-31 17:58:48 -07:00
Trilbyspaceclone a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
Coolgat3 674e8a4227 Glubbs 2019-05-30 18:59:43 +02:00
Trilbyspaceclone 39700503f9 Update miscellaneous.dm 2019-05-30 11:40:37 -04:00
Trilbyspaceclone 618c2c070c Update ert.dm 2019-05-30 11:36:20 -04:00
deathride58 3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Useroth 848f3910e6 Oops. Now it compiles fine. 2019-05-28 09:32:59 +02:00
Useroth eb6e710b18 Forgot to uncomment the clown check on the shoes. 2019-05-28 09:17:03 +02:00
Trilbyspaceclone e0e0142fb1 Better grammar 2019-05-22 18:26:06 -04:00
Trilbyspaceclone 3168c956a9 *cough* 2019-05-22 15:46:57 -04:00
Trilbyspaceclone 6fbe698e32 I know what im doing, I sware 2019-05-22 15:45:47 -04:00
Trilbyspaceclone 90bc986b84 Bhijn's sanity 2019-05-22 15:33:50 -04:00
Trilbyspaceclone 80b44ac0f4 Update hardsuit.dm 2019-05-22 14:37:24 -04:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
Ghommie 20124c24ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-05-21 22:48:59 +02: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
Poojawa 5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05:00