TrilbySpaceClone
|
74c607b2df
|
Ghommie Asked
|
2019-06-23 17:15:03 -04:00 |
|
Trilbyspaceclone
|
8418ce8a34
|
Merge branch 'Poojawa_How_Do_I_Update_My_Shit' into Just-in-case-pls
|
2019-06-23 02:54:02 -04:00 |
|
TrilbySpaseClone
|
0ea7ce3731
|
No...
|
2019-06-23 02:51:01 -04:00 |
|
Trilbyspaceclone
|
4278284e7b
|
Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit
|
2019-06-23 01:52:59 -04:00 |
|
TrilbySpaseClone
|
7f4d60ae25
|
Poojawa this would been easyer with webedits
|
2019-06-23 01:49:45 -04: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
|
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 |
|
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 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02: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 |
|
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 |
|
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 |
|
kevinz000
|
ed4c9506a7
|
Merge pull request #8388 from Useroth/collars-n-shit
Quick fix for the colorable collars. I've made the mistake of not testing code after applying a suggestion.
|
2019-05-18 08:30:10 -07:00 |
|
Useroth
|
8ea639a5ac
|
Quick fix for the colorable collars.
|
2019-05-18 15:26:46 +02: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 |
|
Useroth
|
701b01dfa6
|
Just another commit to make travis fucking recompile it
|
2019-05-15 02:30:47 +02:00 |
|
Useroth
|
8500e69088
|
Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit
|
2019-05-15 02:09:41 +02:00 |
|
Useroth
|
3f64128513
|
Apply suggestions from code review
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-05-15 02:08:43 +02:00 |
|
Useroth
|
6a29a0744b
|
Applied suggested changes.
|
2019-05-15 02:07:16 +02:00 |
|
Useroth
|
f910eea9f8
|
Update code/modules/clothing/neck/_neck.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-05-15 01:41:18 +02:00 |
|
kevinz000
|
9f3aa6de13
|
Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
Better Locked Collar checks
|
2019-05-11 22:21:16 -07:00 |
|
Useroth
|
4355584833
|
Added them to loadout too.
|
2019-05-09 12:09:18 +02:00 |
|
Useroth
|
abe8ed16cb
|
A small touch-up.
|
2019-05-09 11:38:33 +02:00 |
|
Useroth
|
1efd7123f2
|
Two new collar types. All collars are now colorable a'la polychromic stuff.
|
2019-05-09 11:22:51 +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 |
|
Trilbyspaceclone
|
0aa78684a5
|
I guess cookies unlock collars are not intended
|
2019-05-01 18:36:54 -04:00 |
|