Lin
|
fe263ae2ff
|
Merge pull request #13890 from silicons/parry
ablative parry armwraps
|
2021-02-05 23:52:18 -06:00 |
|
zerothebigboy
|
50a47f56bb
|
i forgot a sprite
|
2021-02-03 11:51:50 -05:00 |
|
silicons
|
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 |
|
MrJWhit
|
5a75028889
|
neck
|
2021-01-27 23:17:36 -05: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 |
|
silicons
|
a1e92e55aa
|
Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
|
2021-01-25 23:17:29 -07:00 |
|
Hatterhat
|
cbc19c7e91
|
depcards not in lockers
|
2021-01-23 19:37:39 -06:00 |
|
silicons
|
718cb3f501
|
Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
|
2021-01-20 15:21:06 -07:00 |
|
Hatterhat
|
a8cb8b79c6
|
for one, dont forget the sprites, dumbass
|
2021-01-19 17:40:34 -06: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 |
|
silicons
|
4099e57f4e
|
Merge pull request #13963 from necromanceranne/robocoat
Mostly ports tgstation #54644; New roboticist labcoat sprites
|
2021-01-17 20:43:24 -07:00 |
|
silicons
|
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 |
|
silicons
|
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 |
|
silicons
|
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 |
|
DeltaFire
|
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 |
|
DeltaFire
|
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 |
|
silicons
|
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
|
1b9a399bbd
|
Merge pull request #13905 from zeroisthebiggay/help
gives codex cicatrix inhands
|
2020-12-30 14:46:26 -07:00 |
|
silicons
|
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 |
|
silicons
|
53253bfce1
|
changes
|
2020-12-27 10:13:09 -08: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 |
|