shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,616 Commits 5 Branches 0 Tags
0faafe8deb1c898b2efe8ea724e9bfa013079c7d
Commit Graph

23616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Poojawa
0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
CitadelStationBot
cc462d7fa0 Automatic changelog generation for PR #9109 [ci skip] 2019-09-13 23:20:48 -05:00
kevinz000
ea43b941eb Merge pull request #9109 from Trilbyspaceclone/fruit 
Adds Catnip plants and tea
 2019-09-13 21:20:46 -07:00
Poojawa
344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Trilbyspaceclone
5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa
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
CitadelStationBot
b2cde8e121 Automatic changelog generation for PR #9199 [ci skip] 2019-09-13 12:47:17 -05:00
kevinz000
39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy 
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
 2019-09-13 10:47:15 -07:00
CitadelStationBot
ed2e73d817 Automatic changelog generation for PR #9241 [ci skip] 2019-09-13 12:46:13 -05:00
kevinz000
e107c51e19 Merge pull request #9241 from Linzolle/oracleui 
Ports Oracle UI framework, and updates UI for paper and disposal bins.
 2019-09-13 10:46:11 -07:00
CitadelStationBot
c0f40fc096 Automatic changelog generation for PR #9279 [ci skip] 2019-09-13 12:43:45 -05:00
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192 
Fixing undergarments color preferences resetting each round.
 2019-09-13 10:43:43 -07:00
CitadelStationBot
53f224651d Automatic changelog generation for PR #9275 [ci skip] 2019-09-13 12:43:24 -05:00
kevinz000
591a584785 Merge pull request #9275 from Thalpy/InitialD 
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
 2019-09-13 10:43:22 -07:00
CitadelStationBot
8f8340f567 Automatic changelog generation for PR #9276 [ci skip] 2019-09-13 12:43:02 -05:00
kevinz000
c4f5ce67b8 Merge pull request #9276 from Trilbyspaceclone/war_on_fashen 
Adds clip on pokadoted pants, only in 4 types for now
 2019-09-13 10:43:00 -07:00
CitadelStationBot
f13d6a9c8c Automatic changelog generation for PR #9251 [ci skip] 2019-09-13 12:42:44 -05:00
kevinz000
42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time 
Allow all chaplain gear to equip the same things in their suit storage
 2019-09-13 10:42:42 -07:00
kevinz000
63d2273a75 Merge pull request #9220 from Thalpy/Catnip-Furranium 
Allows Furranium grown from organic sources.
 2019-09-13 10:41:07 -07:00
kevinz000
4494f42155 Merge pull request #9270 from Linzolle/reallyguys 
fixes donuts being uncraftable
 2019-09-13 10:40:21 -07:00
Poojawa
9561819fb7 Fixes Horn coloration issues, allows mammals to choose their meat type 
Because reasons I guess.
 2019-09-13 10:58:04 -05:00
Linzolle
1e6972d6cc pubby fix 2019-09-12 23:39:58 -05:00
Linzolle
213bd2fc6b fixes 2019-09-12 23:35:21 -05:00
Poojawa
8946d6d059 Update preferences_savefile.dm 2019-09-12 19:02:06 -05:00
Poojawa
4289f4c419 Better way of doing the conversions I think 2019-09-12 19:01:39 -05:00
CitadelStationBot
de19b4f805 Automatic changelog generation for PR #9278 [ci skip] 2019-09-12 14:10:04 -05:00
kevinz000
39b840b180 Merge pull request #9278 from deathride58/fuckkeydown 
[s] ports tgstation/tgstation#46425
 2019-09-12 12:10:01 -07:00
CitadelStationBot
e48fe1bbe3 Automatic changelog generation for PR #9086 [ci skip] 2019-09-12 01:37:59 -05:00
BlackMajor
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
Poojawa
4a4fe8c03c Adding snowflake to limbgrower 2019-09-12 00:59:28 -05:00
Poojawa
b5a96dc325 Update holidays.dm 2019-09-12 00:53:34 -05:00
Poojawa
7bb8d430e2 Moth week exists I guess 2019-09-12 00:51:15 -05:00
Ghommie
025b6122d4 short colors 2019-09-12 02:58:34 +02:00
Ghommie
e0a29ec001 Fixing undergarments color resetting each round. 2019-09-12 02:48:26 +02:00
deathride58
4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
Poojawa
6dfb22ea47 Update preferences_savefile.dm 2019-09-11 17:58:32 -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
Fermi
6b76b09449 Missed 2 2019-09-11 23:30:56 +01:00
TrilbySpaceClone
fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
Fermi
c79c4aafa5 Cleans up var/test into targetReagent 2019-09-11 18:51:05 +01:00
Fermi
409cbe876a Okay ACTUALLY does what I want it to. 2019-09-11 18:46:32 +01:00
Fermi
d59196f430 oops 2019-09-11 16:38:55 +01:00
Linzolle
daba09582a move to misc.dm 2019-09-11 10:18:10 -05:00
CitadelStationBot
e6ac254ded Automatic changelog generation for PR #9260 [ci skip] 2019-09-11 05:26:55 -05:00
kevinz000
f4bff19592 Merge pull request #9260 from dapnee/trim-decals 
Ports trim decals
 2019-09-11 03:26:47 -07:00
CitadelStationBot
df8b4c86ae Automatic changelog generation for PR #9147 [ci skip] 2019-09-11 00:06:38 -05:00
kevinz000
ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2019-09-10 22:06:36 -07:00
CitadelStationBot
e9a4e732c0 Automatic changelog generation for PR #9077 [ci skip] 2019-09-11 00:04:51 -05:00
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo 
No ID insertion for everything except the hop console
 2019-09-10 22:04:48 -07:00