 siliconsandGitHub
|
718cb3f501
|
Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
|
2021-01-20 15:21:06 -07:00 |
|
|
Hatterhat
|
fccf24ac17
|
sheef
|
2021-01-19 16:54:49 -06: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 |
|
|
siliconsandGitHub
|
4099e57f4e
|
Merge pull request #13963 from necromanceranne/robocoat
Mostly ports tgstation #54644; New roboticist labcoat sprites
|
2021-01-17 20:43:24 -07:00 |
|
|
siliconsandGitHub
|
2266a9e17b
|
Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
|
2021-01-17 20:42:19 -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 |
|
|
DeltaFire
|
f591bff85b
|
sprite stuff
|
2021-01-12 23:54:40 +01:00 |
|
|
DeltaFire
|
13beddd42b
|
nanogel time
|
2021-01-12 23:02:44 +01:00 |
|
|
kappa-sama
|
f3e328af03
|
hot sauce
|
2021-01-12 10:04:56 -05:00 |
|
|
kappa-sama
|
c751f114aa
|
finally
|
2021-01-12 01:42:55 -05: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 |
|
|
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 |
|
|
DeltaFireandGitHub
|
d100fe1d58
|
Merge pull request #13981 from MrJWhit/caution-sign
Porting the ability to wear the caution sign (plus a random metastation fix)
|
2021-01-07 20:17:03 +01:00 |
|
|
DeltaFireandGitHub
|
3f736aaa36
|
Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
|
2021-01-06 19:29:17 +01: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 |
|
|
Timothy Teakettle
|
535dede85b
|
i teleported bread
|
2021-01-05 22:20:41 +00:00 |
|
|
zerothebigboy
|
d2ebbf9566
|
awoo
|
2021-01-05 16:26:05 -05:00 |
|
|
necromanceranne
|
0fda694a52
|
A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.
|
2021-01-04 15:30:28 +11: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 |
|
|
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 |
|
|
siliconsandGitHub
|
1b9a399bbd
|
Merge pull request #13905 from zeroisthebiggay/help
gives codex cicatrix inhands
|
2020-12-30 14:46:26 -07:00 |
|
|
siliconsandGitHub
|
da25c48b2c
|
Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
|
2020-12-29 01:27:49 -07:00 |
|
|
zerothebigboy
|
6f38ec403f
|
help
|
2020-12-28 15:34:35 -05:00 |
|
|
timothyteakettle
|
1b450f7f14
|
Update bedsheets.dmi
|
2020-12-26 01:55:11 +00:00 |
|
|
timothyteakettle
|
41115bacb5
|
Update bedsheets.dmi
|
2020-12-26 01:48:06 +00:00 |
|
|
Chiirno
|
35896e92ec
|
Paramedic office added and operating room remodeled
|
2020-12-22 21:50:22 -04:00 |
|
|
zerothebigboy
|
cca8dc3a36
|
pogbox
|
2020-12-21 18:25:33 -05:00 |
|
|
siliconsandGitHub
|
901fcddf44
|
Merge pull request #13819 from Hatterhat/surv-dag-buf
survival dagger light fix + butchery buff
|
2020-12-21 10:30:13 -07:00 |
|
|
LinandGitHub
|
3ad777f8f7
|
Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
|
2020-12-20 18:14:48 +00:00 |
|
|
Hatterhat
|
b8b2f34735
|
funny knife
|
2020-12-19 18:45:25 -06:00 |
|
|
siliconsandGitHub
|
4382fd7073
|
Merge pull request #13767 from MrJWhit/new-meat-sprites
Pretty meat icons update
|
2020-12-13 23:09:26 -07:00 |
|
|
DeltaFireandGitHub
|
3bd1965c7d
|
Merge pull request #13769 from MrJWhit/goose-bar-sign
Adds goose bar sign
|
2020-12-14 06:06:03 +01:00 |
|
|
DeltaFireandGitHub
|
113366754f
|
Merge pull request #13765 from MrJWhit/new-jukebox-sprites
Fancier jukebox sprites
|
2020-12-14 05:24:47 +01:00 |
|
|
MrJWhit
|
f5b99b83f8
|
Fully functional
|
2020-12-13 02:29:29 -05:00 |
|
|
MrJWhit
|
939d6b7ad8
|
goose barsign
|
2020-12-13 00:57:05 -05:00 |
|
|
MrJWhit
|
4c1013e455
|
Update food.dmi
|
2020-12-12 23:53:55 -05:00 |
|
|
MrJWhit
|
7ae10f2b26
|
Update stationobjs.dmi
|
2020-12-12 23:21:05 -05:00 |
|
|
silicons
|
4b20d26d2b
|
Merge remote-tracking branch 'citadel/master' into colormates
|
2020-12-12 01:56:37 -07:00 |
|