48e4187cef
Merge pull request #9461 from r4d6/master
...
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
0c8b82168d
Merge branch 'master' into Ghommie-cit222
2019-10-12 11:20:32 -04:00
8b1e140fa0
Update code/__HELPERS/mobs.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:14 -04:00
618f8f30c5
Update code/__HELPERS/global_lists.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:09 -04:00
2822f43720
Update global_lists.dm
2019-10-10 20:32:25 -04:00
05fa19c856
Update mobs.dm
2019-10-10 20:32:24 -04:00
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
3d404b6967
Merge pull request #9287 from Thalpy/Wiki
...
Adds a markdown parse of all chems for use with github wiki to debug menu.
2019-10-08 00:30:00 -07:00
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
fce6f13471
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
2019-10-07 23:58:15 +02:00
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
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
37a1e39744
Merge branch 'master' into Wiki
2019-09-21 01:29:45 +01:00
8b477a8bcf
Edits output to be a .md and now you can open it in game!! Magic!
2019-09-20 23:30:51 +01:00
277f031143
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
2019-09-20 02:27:39 +02:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
f0afc9c490
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-13 12:59:15 -05:00
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
7e7527dcfe
Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY
...
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
2019-09-12 18:37:56 +12:00
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
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
9ec97579bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
2019-09-03 21:08:09 +02:00
c641874aab
Update unsorted.dm
2019-08-29 20:50:36 -04:00
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
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -05:00
2406254faa
Merge pull request #9100 from cebutris/got-milk
...
Breasts no longer lactate by default, Lactation is now a preference
2019-08-14 15:40:53 -04:00
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
df136ab96c
lactation is now a preference
2019-08-10 23:28:16 -04:00
4ba3d851ed
IT JUST WORKS
2019-08-09 00:46:14 -04:00
65473dc4ba
s
2019-08-07 13:18:45 -07:00
277971971f
s
2019-08-07 13:07:38 -07:00
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
9d183beb9c
Added
2019-07-17 18:15:55 -07:00
b818b1eedd
Updating spraycans and crayons code.
2019-07-17 15:45:48 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
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
628244c0ba
Merge pull request #8869 from Ghommie/Ghommie-cit129
...
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
e5d445c4d3
Merge pull request #8846 from Ghommie/Ghommie-cit122
...
Rubber toolboxes.
2019-07-12 07:35:25 -07:00
1eaddd3ebf
Merge pull request #8853 from Ghommie/Ghommie-cit125
...
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
kevinz000