silicons and GitHub
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
silicons and GitHub
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
silicons and GitHub
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
silicons and GitHub
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
silicons and GitHub
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
necromanceranne
6a247e2a68
Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites
2021-01-02 04:26:39 +11:00
necromanceranne
0aa5338f9b
Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays
2021-01-01 05:42:28 +11:00
silicons and GitHub
1b9a399bbd
Merge pull request #13905 from zeroisthebiggay/help
...
gives codex cicatrix inhands
2020-12-30 14:46:26 -07:00
silicons and GitHub
667651aebb
Merge pull request #13915 from Xantholne/Birdsitfix
...
Fixes new bird sprites defaulting to basic parrot when sitting
2020-12-30 14:44:28 -07:00
DeltaFire and GitHub
eebb2e945a
Merge pull request #13902 from timothyteakettle/slime-legs
...
slimes can now have digitigrade/avian legs
2020-12-30 18:25:48 +01:00
Xantholne
0db821f4f5
Fixes missing electus red from trying to be basic parrot and adds
2020-12-29 19:33:09 -07:00
Xantholne
5f75cee5ae
fucking dashes
2020-12-29 19:21:07 -07:00
Xantholne
76ecd2cbb3
Fixes new bird sprites defaulting to basic parrot when sitting
2020-12-29 19:14:41 -07:00
silicons and GitHub
a0fb594236
Merge pull request #13900 from Xantholne/Birds
...
Ports cute birbs from RP
2020-12-29 00:50:58 -07:00
zerothebigboy
6f38ec403f
help
2020-12-28 15:34:35 -05:00
Timothy Teakettle
bdb05f5e85
Merge remote-tracking branch 'upstream/master' into slime-legs
2020-12-28 17:22:53 +00:00
Timothy Teakettle
2c7aee9419
Update human_parts_greyscale.dmi
2020-12-28 17:21:44 +00:00
Xantholne
121b1bb7fd
Ports parrots from RP
2020-12-27 22:51:18 -07:00
Sonic121x and GitHub
b70ddb9102
Add files via upload
2020-12-28 04:23:12 +08:00
Timothy Teakettle
c3e9cdd9a5
finale
2020-12-26 23:09:19 +00:00
timothyteakettle
76b291c0b5
action
2020-12-13 01:16:25 +00:00
DeltaFire
73d3234882
buncha changes
2020-12-07 22:15:04 +01:00
DeltaFire15 and GitHub
a1d38033a4
Merge pull request #13576 from Sonic121x/patch-2
...
Add a bunch of digitigrade uniform
2020-11-27 22:31:10 +01:00
silicons and GitHub
c7396632db
Merge pull request #13582 from timothyteakettle/i-hate-mcolor
...
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
Jay
e1c8d669d5
Exo frame donator
2020-11-07 10:23:14 -06:00
46dbb9345d
slime puddles look better and cant be abused by lings ( #13567 )
...
* perfect
* further changes
* no squeaking please
* no more squeaking damnit
* no more squeaking damnit
* slower
* they get broken armor
* broken armor application
* Apply suggestions from code review
* add a comma
* make crossed work properly
* Update squeak.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-11-01 21:40:58 +01:00
silicons and GitHub
5c53a2cbe2
Merge pull request #13607 from timothyteakettle/polychrome-maid
...
polychromic maid outfit
2020-10-28 07:46:55 -07:00
timothyteakettle
87be4581d7
better
2020-10-27 22:14:35 +00:00
timothyteakettle
cf49e78d45
Merge remote-tracking branch 'upstream/master' into i-hate-mcolor
2020-10-27 22:12:55 +00:00
