Commit Graph

1630 Commits

Author SHA1 Message Date
zerothebigboy
4cd74e3b31 thighjob from a girl wearing a microskirt who can beat the shit out of you whenever 2022-08-21 20:55:37 -04:00
zerothebigboy
b0869fcc2c man am i blind 2022-08-20 16:43:39 -04:00
zerothebigboy
44275e7493 i am thoroughly erect 2022-08-14 21:58:48 -04:00
Putnam3145
db06dbcd58 forgot to commit and push 2022-08-02 16:44:05 -07:00
silicons
253be000c0 Merge pull request #15676 from TrojanCoyote/trojancoyote
HoS plate carrier
2022-06-19 18:56:16 -07:00
TrojanCoyote
1553b99107 Lets inheritance decide volume 2022-06-13 11:17:21 -05:00
TrojanCoyote
ad74a6033e HoS plate carrier
adds a plate carrier for the HoS
2022-06-08 17:52:32 -05:00
Timothy Teakettle
5840fdf62e stupid 2022-06-07 15:43:46 +01:00
Timothy Teakettle
3580070806 OOPS 2022-06-02 20:44:19 +01:00
Timothy Teakettle
c025a4f36e commit names arent important right? 2022-06-02 20:40:21 +01:00
Timothy Teakettle
dad0aa72f0 OH BOY 2022-06-02 19:18:11 +01:00
silicons
ec01dc69ac Merge pull request #15642 from deathride58/multblood
Multiplicative blood
2022-06-01 15:14:09 -07:00
TrojanCoyote
0a724a44a6 Kitsune masks
black and white kitsune masks
2022-05-30 22:25:24 -05:00
deathride58
20eb61b319 makes slimes specifically have overlay-blended blood! 2022-05-26 22:56:10 -04:00
deathride58
a37c3a8721 multiplicative blood - makes the majority of blood visuals use multiplicative blending 2022-05-25 03:25:20 -04:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
silicons
2323bd31cd Merge pull request #15522 from bunny232/wintercoats
Insulation works both ways you know.
2022-02-26 18:08:59 -07:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
evan
6db0142ec3 fluffy tail costume. 2022-02-21 18:58:54 -05:00
evan
7f9d7936f0 a 2022-02-21 18:31:48 -05:00
evan
2619387dc1 woops 2022-02-21 18:25:12 -05:00
evan
93c322f494 a 2022-02-21 18:23:41 -05:00
evan
4d403ebca5 Update miscellaneous.dm 2022-02-21 18:14:56 -05:00
evan
6b3fb90ef6 keep the cold in 2022-02-21 17:44:27 -05:00
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
Timothy Teakettle
c9051a6a08 adds polychromic clown outfit and mask (#15359)
* why

* polyclown

* outfit / loadout / etc

* its not pink what do you mean

* newline

* fixes

* test icon diffs
2022-02-18 14:38:50 -08:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
Hatterhat
cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
BlueWildrose
9437a97967 Merge branch 'Citadel-Station-13:master' into wingport 2021-12-29 15:27:08 -07:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
Cognition
318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07:00
Linzolle
c2378d3f26 helmet stuff 2021-11-29 17:40:08 -07:00
Lin
336a66edd5 Merge pull request #15386 from keronshb/winterball2021
FestiveMap (Winter Ball 2021)
2021-11-27 23:44:51 +00:00
SandPoot
3618248b4e Upload files 2021-11-24 23:11:12 -03:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
LetterN
1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
keronshb
46e5372f10 No anthro icons 2021-10-15 19:57:11 -04:00
keronshb
6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00