shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,411 Commits 5 Branches 0 Tags
2ddb69a135b75ee3be7d05caecfe9b0a62ff02c2
Commit Graph

315 Commits

Author SHA1 Message Date
deathride58
6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits 
[s] fixes some exploits
 2019-10-14 14:16:46 -04:00
kevinz000
48e4187cef Merge pull request #9461 from r4d6/master 
Adding Decorative Wings
 2019-10-13 14:00:07 -07:00
kevinz000
f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
r4d6
3e7131c7f6 Update wings.dm 2019-10-11 05:43:55 -04:00
JTGSZ
988a943f01 Try number 2 2019-10-11 02:36:10 -04:00
r4d6
1b08c541e2 Update wings.dm 2019-10-10 21:11:48 -04:00
r4d6
e85e499504 I forgot a part. 
Copy-pasted the Angel's wings' bit of code to have something to show.
 2019-10-10 20:45:38 -04:00
r4d6
2d84b541cf Update wings.dm 2019-10-10 20:32:15 -04:00
kevinz000
c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails 
Corrects a missing tail state
 2019-10-10 02:10:31 -07:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Poojawa
cbefe95ade Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails 2019-10-08 13:50:29 -05:00
Poojawa
93ad7f1066 Corrects a missing tail state 2019-10-07 04:30:23 -05:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
deathride58
d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
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
Ghommie
5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02: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
4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +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
a3ab5f6d23 Moving the snowflake mob var to the component and finalizing. 2019-07-04 02:03:51 +02:00
Ghommie
c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +02: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