 silicons
|
e13b6d36da
|
Merge pull request #12895 from Hatterhat/bokken
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
|
2020-07-26 15:52:35 -07:00 |
|
|
Hatterhat
|
af08e8a37f
|
altclick for fucked up parries! also bugfixes
|
2020-07-26 13:02:56 -05:00 |
|
|
silicons
|
4d83060ba1
|
Update clothing.dm
|
2020-07-24 19:29:29 -07:00 |
|
|
silicons
|
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 |
|
|
silicons
|
9222933d77
|
Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
|
2020-07-23 10:25:25 -07:00 |
|
|
timothyteakettle
|
a155f24253
|
let santa hat go on
|
2020-07-22 16:53:51 +01:00 |
|
|
timothyteakettle
|
ed1e8c4221
|
support for masks
|
2020-07-22 15:43:58 +01:00 |
|
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
|
timothyteakettle
|
3a520bba3f
|
more hats
|
2020-07-21 23:45:04 +01:00 |
|
|
Timothy Teakettle
|
5c88253f93
|
lots more hats
|
2020-07-21 22:58:13 +01:00 |
|
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
|
timothyteakettle
|
3e0403a7e9
|
BEEPSKY FASHION
|
2020-07-21 02:22:42 +01:00 |
|
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
|
Timothy Teakettle
|
74eadcf9c2
|
removes a singular full stop
|
2020-07-18 22:25:42 +01:00 |
|
|
timothyteakettle
|
74b2764591
|
sprites and some missed things
|
2020-07-18 03:08:03 +01:00 |
|
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
|
Sonic121x
|
b128a21309
|
Paramedic jump suit adjust
paramedic jump suit now adjust able.
light version of paramedic jump suit now have a digitigrade version
|
2020-07-13 20:33:59 +08:00 |
|
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
|
Sneakyrat6
|
3569e8da1e
|
Fixes hair falling out of hoodies
|
2020-07-07 22:31:00 -05:00 |
|
|
silicons
|
dbf88a1408
|
Merge pull request #12676 from Ghommie/Ghommie-cit829
Improvements to the recent clothing menu toggle hardsuit helmet feature.
|
2020-07-04 00:12:29 -07:00 |
|
|
silicons
|
a61e22de71
|
Merge pull request #12675 from Ghommie/Ghommie-cit828
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-04 00:12:04 -07:00 |
|
|
Ghommie
|
92c846fdbf
|
Improvements to the recent clothing menu toggle hardsuit helmet feature.
|
2020-07-03 01:08:28 +02:00 |
|
|
Ghommie
|
6fc584518a
|
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-03 00:07:30 +02:00 |
|
|
Sonic121x
|
4ca695020a
|
add adigitigrade version of captain's female formal outfit.
|
2020-07-02 23:21:31 +08:00 |
|
|
Sonic121x
|
6240ade87d
|
Add digitigrade version of cmoturtleneck
|
2020-07-02 23:20:01 +08:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
|
Timothy Teakettle
|
334d55bef3
|
add support for custom blood colours
|
2020-06-26 20:29:40 +01:00 |
|
|
silicons
|
9f6d0ba10b
|
Merge pull request #12570 from NopemanMcHalt/orvilike_bonus
Adds Kepi and Orvilike Kepi
|
2020-06-24 08:43:03 -07:00 |
|
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02:00 |
|
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
|
Anonymous
|
9e7b884e86
|
Adds remaining TOSOrvikepi
|
2020-06-21 13:25:23 +03:00 |
|
|
Anonymous
|
45dab7fa66
|
Kepi and Orvilike Kepi
|
2020-06-20 22:52:33 +03:00 |
|
|
kevinz000
|
445d94f335
|
haha whew
|
2020-06-17 21:32:10 -07:00 |
|
|
Timothy Teakettle
|
7f2155ea2e
|
fix sprite
|
2020-06-15 21:44:18 +01:00 |
|
|
Timothy Teakettle
|
3811fcbcf1
|
some fixes
|
2020-06-15 21:30:14 +01:00 |
|
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
|
Ghom
|
37294fd4b7
|
Fixing wrong helmet type for old beserker hardsuit (#12503)
|
2020-06-12 17:07:59 -07:00 |
|
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
|
NopemanMcHalt
|
e5bc651140
|
Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447)
* Station has a crew loose
Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform
* hotfix for digi ops
|
2020-06-08 09:14:19 -07:00 |
|
|
Lin
|
5e37d3ef3b
|
Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
|
2020-06-03 20:23:16 +00:00 |
|
|
Ghom
|
d53dca7322
|
Fixing just a couple issues. (#12417)
|
2020-06-02 15:30:22 -07:00 |
|