 LinandGitHub
|
5517678780
|
Merge pull request #14286 from Citadel-Station-13/metalmaskDonator
Donator Item - Metal Mask
|
2021-02-22 11:15:37 -06:00 |
|
|
Jay
|
73be04412b
|
Donator Item - Metal Mask
|
2021-02-21 19:57:43 -06:00 |
|
|
Adelphon
|
f795d007a9
|
bugfix
|
2021-02-20 18:18:27 -05:00 |
|
|
siliconsandGitHub
|
98d23bb87b
|
Merge pull request #14256 from Adelphon/ppantsg
Polychromic Pants & Jacket
|
2021-02-18 17:41:51 -07:00 |
|
|
siliconsandGitHub
|
e009b9ef5f
|
Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
|
2021-02-17 01:30:13 -07:00 |
|
|
Adelphon
|
4c6685333b
|
Polychromic Pants & Jacket
|
2021-02-16 05:24:45 -05:00 |
|
|
Adelphon
|
919e23c122
|
More Clothes
|
2021-02-11 02:36:50 -05:00 |
|
|
Adelphon
|
28d1f93b1c
|
Clothing PR
I added two clothing that I made.
|
2021-02-09 00:41:11 -05:00 |
|
|
LinandGitHub
|
7778ddaf96
|
Merge pull request #14195 from Citadel-Station-13/choker
Donator Item - NT Choker
|
2021-02-08 13:56:44 -06:00 |
|
|
LinandGitHub
|
fe263ae2ff
|
Merge pull request #13890 from silicons/parry
ablative parry armwraps
|
2021-02-05 23:52:18 -06:00 |
|
|
Jay
|
aba8d2ce2b
|
NT Choker donator item
|
2021-02-05 09:57:19 -06:00 |
|
|
SmArtKar
|
7b2e1ef44f
|
TCG!
|
2021-02-02 14:40:29 +03:00 |
|
|
Hatterhat
|
7c50b45e0d
|
oops
|
2021-01-31 19:53:58 -06:00 |
|
|
siliconsandGitHub
|
540b8c280b
|
Merge pull request #14156 from zeroisthebiggay/cooming
hair ports part two | now featuring skrell hair
|
2021-01-29 07:29:46 -07:00 |
|
|
siliconsandGitHub
|
e417d72703
|
Merge pull request #14150 from zeroisthebiggay/ohgodohfuck
a zero pr that didn't need a followup pr to fix bugs doesn't exist | adds the multicolor berets to loadout
|
2021-01-29 07:29:39 -07:00 |
|
|
siliconsandGitHub
|
1974f2b41d
|
Merge pull request #14148 from zeroisthebiggay/whytho
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
|
2021-01-29 07:29:28 -07:00 |
|
|
zerothebigboy
|
0bc3c5292c
|
arooga
|
2021-01-28 12:31:23 -05:00 |
|
|
MrJWhit
|
5a75028889
|
neck
|
2021-01-27 23:17:36 -05:00 |
|
|
zerothebigboy
|
c6420ae433
|
fuck
|
2021-01-27 22:59:44 -05:00 |
|
|
siliconsandGitHub
|
a973a3b088
|
Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
|
2021-01-27 19:08:25 -07:00 |
|
|
zerothebigboy
|
e7d8021b81
|
a
|
2021-01-27 18:46:11 -05:00 |
|
|
zerothebigboy
|
ee74f2c06c
|
here comes fetish content
|
2021-01-27 15:38:34 -05:00 |
|
|
zerothebigboy
|
f3072433ff
|
thankyoubasedrp
|
2021-01-27 14:56:26 -05:00 |
|
|
zerothebigboy
|
ad2864f137
|
aeughfuck
|
2021-01-27 13:30:44 -05:00 |
|
|
siliconsandGitHub
|
718cb3f501
|
Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
|
2021-01-20 15:21:06 -07:00 |
|
|
necromanceranne
|
741fd455ec
|
Fixes deleted hypereutatic blade sprites
|
2021-01-19 19:46:11 +11:00 |
|
|
Blue Wildrose
|
88c21942d0
|
Merge branch 'master' into Timidwomen
|
2021-01-18 14:42:52 -07:00 |
|
|
Blue Wildrose
|
fd69938884
|
Tired of these motherfucking merge conflicts on this motherfucking PR
|
2021-01-18 14:31:40 -07:00 |
|
|
Blue Wildrose
|
381f27c5b1
|
will this work?
|
2021-01-18 14:28:16 -07:00 |
|
|
Blue Wildrose
|
b2f036de6b
|
Fuck merge conflicts icons are fucking annoying
|
2021-01-18 14:22:27 -07:00 |
|
|
Blue Wildrose
|
0c139970c8
|
merge conflict resolution attempt
|
2021-01-18 14:16:45 -07:00 |
|
|
Blue Wildrose
|
a49f98aac8
|
attempting to resolve merge conflict
|
2021-01-18 14:12:30 -07:00 |
|
|
Blue Wildrose
|
c79177ab07
|
Adds Timid wo/man outfits
|
2021-01-18 13:42:38 -07:00 |
|
|
necromanceranne
|
5b5bc85b8f
|
Fixes conflicts AGAIN
|
2021-01-16 04:58:47 +11:00 |
|
|
siliconsandGitHub
|
aa830b257a
|
Merge pull request #13975 from zeroisthebiggay/paramed
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
|
2021-01-13 16:58:04 -07:00 |
|
|
siliconsandGitHub
|
f7cadc3293
|
Merge pull request #14009 from shellspeed1/wing-stuff
Ports a bunch of wings from cit RP and fulpstation [Ready]
|
2021-01-13 16:47:34 -07:00 |
|
|
Hatterhat
|
508475d2a4
|
sabre off inhand fix
|
2021-01-12 16:36:02 -06:00 |
|
|
shellspeed1
|
6e408d470a
|
found more extra pixels on existing moth wings, removed them.
|
2021-01-09 18:25:30 -08:00 |
|
|
necromanceranne
|
d7d342cc75
|
Back sprites as well
|
2021-01-10 05:48:27 +11:00 |
|
|
necromanceranne
|
6d10ca9efa
|
Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts
|
2021-01-10 05:43:33 +11:00 |
|
|
shellspeed1
|
773a04e5ea
|
Ports wings
|
2021-01-09 01:56:56 -08:00 |
|
|
zerothebigboy
|
b40dfc1c66
|
conflicties
|
2021-01-08 14:36:44 -05:00 |
|
|
zerothebigboy
|
82b00cd656
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into paramed
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
|
2021-01-08 14:32:46 -05:00 |
|
|
siliconsandGitHub
|
2c8326df35
|
Merge pull request #13976 from timothyteakettle/bread
i have done nothing but teleport bread for three days
|
2021-01-08 01:14:54 -07:00 |
|
|
MrJWhit
|
abffac67b2
|
Port'n
|
2021-01-06 03:16:08 -05:00 |
|
|
timothyteakettle
|
22cab3c275
|
sprite fixes
|
2021-01-05 23:28:53 +00:00 |
|
|
timothyteakettle
|
a375448a54
|
fixes
|
2021-01-05 23:18:52 +00:00 |
|
|
zerothebigboy
|
d2ebbf9566
|
awoo
|
2021-01-05 16:26:05 -05:00 |
|
|
siliconsandGitHub
|
4c6cc24343
|
Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
|
2021-01-03 18:18:29 -07:00 |
|
|
Timothy Teakettle
|
813e0f4c79
|
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
|
2021-01-01 22:30:04 +00:00 |
|