zerothebigboy
|
68e2eb1d7a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
|
2021-09-10 12:12:57 -04:00 |
|
zerothebigboy
|
5a8a069cd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
|
2021-09-09 04:49:30 -04:00 |
|
silicons
|
bb7ee63eae
|
Merge pull request #15058 from zeroisthebiggay/headass
the unatomized hypospray/medbay tools/emergency kits resprite
|
2021-09-08 20:40:20 -07:00 |
|
keronshb
|
ea3b248e6c
|
Ports Parade outfit changes
|
2021-09-05 14:17:52 -04:00 |
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
zerothebigboy
|
5206524dd4
|
gommit
|
2021-09-02 07:38:48 -04:00 |
|
zerothebigboy
|
9f4f099880
|
gommit
|
2021-09-02 03:05:23 -04:00 |
|
zerothebigboy
|
30134a0d2f
|
cool
|
2021-09-01 06:32:33 -04:00 |
|
silicons
|
59e541d2e7
|
Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
|
2021-08-08 04:06:18 -07:00 |
|
BlueWildrose
|
cfc3a12a26
|
these don't have alternate sprites so therefore...
|
2021-08-01 07:24:36 -07:00 |
|
BlueWildrose
|
f747f76bd4
|
fix kimonos
|
2021-08-01 07:18:45 -07:00 |
|
BlueWildrose
|
fb886778b2
|
fix bathrobe
|
2021-08-01 07:17:29 -07:00 |
|
BlueWildrose
|
1b31e4d626
|
let's fix some grammar while we're here.
|
2021-07-31 05:31:21 -07:00 |
|
BlueWildrose
|
698969933e
|
fixing qipao women fitted states
|
2021-07-31 05:18:50 -07:00 |
|
BlueWildrose
|
ef413f5d2b
|
fix miscellaneous female fittings
|
2021-07-31 05:15:46 -07:00 |
|
Artur
|
82ccfc40dc
|
/obj/screen --> /atom/movable/screen
|
2021-07-29 13:57:19 +03:00 |
|
Putnam3145
|
ebb8d278a1
|
Runtime fix; need to update auxmos or it's lies
|
2021-07-25 18:45:17 -07:00 |
|
Putnam3145
|
f1560cb807
|
fixing a bunch of unit test/runtime issues
|
2021-07-25 18:40:11 -07:00 |
|
YakumoChen
|
bff3c840c0
|
human skin hats
|
2021-07-05 05:04:18 +00:00 |
|
YakumoChen
|
2d8ba411a4
|
human leather hat
|
2021-07-05 04:57:14 +00:00 |
|
silicons
|
c1928c9446
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-16 19:04:16 -07:00 |
|
Lin
|
1e66357706
|
Merge pull request #14851 from Vynzill/spritinghell
Extended Armwraps
|
2021-06-16 11:30:01 -07:00 |
|
Vynzill
|
df72710cae
|
herewego
|
2021-06-14 17:19:05 -05:00 |
|
silicons
|
8595e05ad9
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-13 15:37:35 -07:00 |
|
silicons
|
a91d5111c4
|
Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt
(held against my will) adds a onesleeved croptop
|
2021-06-13 15:19:37 -07:00 |
|
silicons
|
2dd0d014b9
|
Merge pull request #14813 from SandPoot/small-issues
Fixes some small issues with cosmetic syndicate clothing (loadout clothing)
|
2021-06-13 15:15:32 -07:00 |
|
zerothebigboy
|
a395fc1b52
|
a
|
2021-06-12 19:58:53 -04:00 |
|
SandPoot
|
d70a35a48d
|
upload syndicate.dm
|
2021-06-09 15:49:57 -03:00 |
|
silicons
|
eb4b4088f4
|
Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
|
2021-06-09 11:21:22 -07:00 |
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
WanderingFox95
|
015bd3c338
|
Armor for security armor and a small fix
|
2021-06-02 17:22:46 +02:00 |
|
WanderingFox95
|
5c827d9796
|
Bit of that
|
2021-06-02 15:28:46 +02:00 |
|
keronshb
|
70926f5daf
|
Merge remote-tracking branch 'upstream/master' into floorcluwneport
|
2021-05-31 22:21:34 -04:00 |
|
silicons
|
e1efdb7937
|
Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
|
2021-05-27 21:26:52 -06:00 |
|
keronshb
|
78db6bd5c2
|
Ports Floor Cluwnes
Oh fuck oh god
|
2021-05-26 21:58:35 -04:00 |
|
zeroisthebiggay
|
bdd7ae54d4
|
Update miscellaneous.dm
|
2021-05-24 23:10:07 -04:00 |
|
zerothebigboy
|
fc3c898cd4
|
tab
|
2021-05-24 21:49:36 -04:00 |
|
zerothebigboy
|
36fe3fef76
|
abuse
|
2021-05-24 21:40:15 -04:00 |
|
keronshb
|
d7ae90eb13
|
Digitigrade vers
|
2021-05-24 13:33:12 -04:00 |
|
keronshb
|
77d302f8f6
|
Ports Swag Outfit
|
2021-05-24 12:47:55 -04:00 |
|
zerothebigboy
|
bc61ada440
|
KILL
|
2021-05-19 13:24:40 -04:00 |
|
zerothebigboy
|
af4823e83c
|
KILL
|
2021-05-19 09:19:49 -04:00 |
|
zerothebigboy
|
e22bdc3fb5
|
KILL
|
2021-05-18 18:56:28 -04:00 |
|
zerothebigboy
|
fff719c408
|
KILL
|
2021-05-18 18:47:12 -04:00 |
|
zerothebigboy
|
5138d86655
|
skylarlineman'safurry
|
2021-05-05 03:35:25 -04:00 |
|
Lin
|
c80c974b6c
|
Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
|
2021-04-29 22:24:00 -05:00 |
|
silicons
|
9bef72f205
|
Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
|
2021-04-28 21:17:06 -06:00 |
|
qweq12yt
|
3afb801036
|
huh
|
2021-04-28 15:41:20 -03:00 |
|
SandPoot
|
5bb6078def
|
upload files
|
2021-04-22 20:39:21 -03:00 |
|
necromanceranne
|
0a5b587304
|
Adds fake blindfolds. For reasons.
|
2021-04-21 12:06:34 +10:00 |
|