Commit Graph

293 Commits

Author SHA1 Message Date
Poojawa
6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
Poojawa
bf3d30c0e4 Seperates Insect fluff from wings
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
0ac3a2307d Update wings.dm 2019-09-11 17:48:57 -05:00
Poojawa
94afbbd560 Adding Horn colors, multiple-select legs, and species squash
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Poojawa
1ba9d374fe whatever, I guess 2019-08-25 01:19:16 -05:00
Poojawa
9cbd8af5b9 Updates colors, fixes alignment issues. 2019-08-18 14:38:10 -05:00
Poojawa
2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
Poojawa
d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
kevinz000
8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170
undergarment fixes.
2019-08-04 19:13:21 -07:00
Poojawa
d0d6bc37a6 Merge branch 'master' into job-menu-improvements 2019-08-02 11:55:28 -05:00
Poojawa
58a27fa082 tabby boi 2019-07-31 19:37:53 -05:00
BurgerLua
c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua
3baac83021 Added 2019-07-31 16:40:35 -07:00
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
Poojawa
8c63ea7b6d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-26 17:36:46 -05:00
kevinz000
d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
081c07098f randomizing colors. 2019-07-11 08:08:07 +02:00
Ghommie
143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02:00
Poojawa
c4f736eb94 Merge branch 'master' into job-menu-improvements 2019-07-10 18:55:29 -05:00
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
kevinz000
30a006e42f additions, and it now nulls out. 2019-07-08 18:21:04 -07:00
kevinz000
adf2166c57 t 2019-07-08 12:31:15 -07:00
Ghommie
49c8a08c15 Removes the ? that suppressed runtimes. 2019-07-07 20:39:40 +02:00
Ghommie
ef745a850d Fixing lobby ghost roles for real. 2019-07-07 20:38:08 +02:00
Ghommie
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Poojawa
f66ee6f967 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-04 00:44:29 -05:00
Ghommie
33687dc2bc I'm an idiot, I need to pick an element within the list, not the list itself!! 2019-07-01 22:53:42 +02:00
Ghommie
d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
deathride58
7e943c0f42 Merge pull request #8737 from Ghommie/Ghommie-cit85
Fixes CWC construct shells being visible as ghost role to latejoiners.
2019-06-28 16:03:53 -04:00
Ghommie
a90ef6faa3 and it's gone. 2019-06-27 15:06:04 +02:00
Ghommie
31b5f2a458 ports "Stockings" 2019-06-24 07:30:13 +02:00
kevinz000
05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
2019-06-23 06:56:17 -07:00
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
2019-06-23 06:50:32 -07:00
Ghommie
b168a8c294 Fixes CWC construct shells being visible as ghost role to latejoiners. 2019-06-23 08:03:56 +02:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie
db3d5848c2 Ports in beekini and bee socks. 2019-06-19 01:28:47 +02:00
Poojawa
f19a3541a3 cleans up runtimes 2019-06-16 19:30:14 -05:00
Poojawa
762a3e3c02 Ports revised job backend from TG 2019-06-16 18:45:26 -05:00
Ghommie
b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
kevinz000
1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
2019-06-08 01:24:59 -07:00
Ghommie
0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
dtfe3
3de6e2d71a twintails...
title
2019-06-05 19:41:23 +02:00
dtfe3
d1d0f38460 Revert "test" 2019-06-05 19:29:53 +02:00
dtfe3
2e47c973c6 Pink Panties 2019-06-05 16:15:38 +02:00
BurgerLua
b44ac0dd74 Reorganizes accessory files, seperates underwear tops from bottoms, and removes gendered clothing. 2019-04-25 18:11:12 -07:00
Poojawa
ba2884d2c7 Fixes missing tail wag states
Also sorts the accessories file a bit more again
2019-04-13 22:01:55 -05:00