silicons
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
Navier
fc70d3dde2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
2020-08-15 23:13:41 -04:00
Lin and GitHub
2fa0b4ae6c
Merge pull request #13105 from silicons/underwear_412
...
ports binder bras from rp
2020-08-14 13:03:25 -05:00
silicons and GitHub
130c3a9480
Merge pull request #13096 from Michiyamenotehifunana/possum
...
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
silicons
6ae11ead4e
less terrible
2020-08-11 07:29:15 -07:00
silicons and GitHub
a8d61b60ef
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
...
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
kiwedespars
036c7dbe39
Merge remote-tracking branch 'upstream/master' into heretics
2020-08-10 21:05:56 -07:00
kiwedespars
415e2556f9
descriptions, conflict, and actually puts requirements for the gamemode.
2020-08-10 20:59:51 -07:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
zerothebigboy
3600da46e7
a
2020-08-10 18:25:05 -04:00
zerothebigboy
6e97e82f53
a
2020-08-10 18:09:20 -04:00
zerothebigboy
1a284709cc
a
2020-08-10 17:50:44 -04:00
zerothebigboy
40e07849ff
a
2020-08-10 17:50:38 -04:00
silicons
375f740d8b
sigh
2020-08-10 04:52:33 -07:00
silicons and GitHub
3795bcf2d0
Merge pull request #13097 from zeroisthebiggay/yessalthairpr
...
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
zerothebigboy
6ddc30c119
a
2020-08-09 08:07:46 -04:00
zerothebigboy
822c17e444
a
2020-08-09 08:07:40 -04:00
Michiyamenotehifunana
9b6156ad81
Ports opposums
...
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
2020-08-09 16:35:12 +08:00
silicons and GitHub
1586625e6b
Merge pull request #12960 from timothyteakettle/loadout-you-say
...
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
silicons and GitHub
009f0ebeeb
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
...
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
silicons and GitHub
4720fedce9
Merge pull request #13003 from Hatterhat/crusher-glaive
...
Proto-Kinetic Glaives - a crusher reskin
2020-08-05 15:25:48 -07:00
Timothy Teakettle
34e2bd626f
woops
2020-08-03 14:50:19 +01:00
Timothy Teakettle
0bf9553eca
hmm
2020-08-02 19:13:39 +01:00
Hatterhat
ccee254546
proof of concept: crusherglaive - squashed
2020-08-02 12:30:14 -05:00
DeltaFire
7dab54e38f
butchering and smol edits
2020-08-01 22:15:38 +02:00
DeltaFire
cf2b1b4d0b
fixes, tweaks and brass claws
...
Gives clockies a replica rabricator on roundstart, makes ratvarian spears able to parry (short parry cycle, short cooldown, timing is essence), adds brass claws to the code though they're not possible to acquire as of now.
2020-08-01 20:28:57 +02:00
Timothy Teakettle
b5a16d8945
MORE CLOTHES
2020-07-29 18:20:46 +01:00
silicons
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
Lin and GitHub
a560920f3c
Merge pull request #12922 from timothyteakettle/let-bots-wear-hats
...
beepsky hats now move with beepsky when he bobs up and down
2020-07-28 22:17:06 -05:00
Lin and GitHub
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
silicons and GitHub
e9d1bcc899
Merge pull request #12938 from necromanceranne/sprite-fixes-rapier
...
adds some in-hands for the rapier sheath
2020-07-28 10:46:34 -07:00
silicons and GitHub
cac1627d26
Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
...
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
necromanceranne
3f84d44510
fixed it up aaaah
2020-07-28 21:33:50 +10:00
necromanceranne
ef611995ed
adds some in-hands for the rapier sheath
2020-07-28 00:19:47 +10:00
silicons and GitHub
f75069a37a
Merge pull request #12899 from Hatterhat/masks
...
literally adds 3 pixels across the board for paper masks
2020-07-26 22:56:39 -07:00
zerothebigboy
1c8007cf78
a
2020-07-27 00:34:28 -04:00
zerothebigboy
6329b2a760
a
2020-07-26 23:32:36 -04:00
BlackMajor and GitHub
5e3cb62790
Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom
...
removes zoomba/roomba borg sprites
2020-07-27 13:00:17 +12:00
Timothy Teakettle
f8545b0a72
more tweaks
2020-07-26 16:59:47 +01:00
Timothy Teakettle
a2f958de3a
sprite tweaking
2020-07-26 16:49:06 +01:00
Timothy Teakettle
73b9ba6cdb
movement sprites
2020-07-26 16:30:20 +01:00
Hatterhat
bf273cffdd
burnt bokken backsprite, wound tweak
2020-07-25 16:18:26 -05:00
Sishen
04feb3c4a5
borg
2020-07-25 03:22:48 -06:00
Hatterhat
7ab095ef1b
literally 3 pixels across the board
2020-07-24 23:49:47 -05:00
Hatterhat
14fba6a056
funny parry sticks
2020-07-24 21:19:01 -05:00
silicons
1f25c7f06d
Merge remote-tracking branch 'citadel/master' into shoelaces
2020-07-23 16:23:34 -07:00
silicons and GitHub
d946998fb9
Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
...
adds deep beepsky lore to the game in the form of hats
2020-07-23 16:18:17 -07:00
timothyteakettle
b15393cfbb
more
2020-07-22 16:37:15 +01:00
timothyteakettle
6c308ec420
more accessories
2020-07-22 16:34:37 +01:00
timothyteakettle
ed1e8c4221
support for masks
2020-07-22 15:43:58 +01:00
silicons