shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,972 Commits 5 Branches 0 Tags
d6b1b7603761a2b6e3abb4b253fb6494de2dde0d
Commit Graph

284 Commits

Author SHA1 Message Date
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
Ghommie
fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" 2019-10-07 23:58:15 +02:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Ghommie
02df68a1cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-02 07:26:09 +02:00
kevinz000
aab93989fb Update poll_ignore.dm 2019-09-28 00:26:09 -07:00
Fermi
d44fbd3fb1 Brain fix 2019-09-27 23:46:44 +01:00
kevinz000
780586aaf5 Update poll_ignore.dm 2019-09-20 16:03:27 -07:00
kevinz000
17542be05b Update poll_ignore.dm 2019-09-20 16:00:21 -07:00
Fermi
9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01:00
Fermi
3f2933adbf Ghommies' requests. 2019-09-19 23:31:36 +01:00
Poojawa
fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -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
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -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
Ghommie
db3c36fd9a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-09-01 01:59:00 +02:00
nik707
bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping 
Donator grouping system
 2019-08-29 18:31:23 -05:00
Ghommie
2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
kevinz000
fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Raptorizer
d16ee247a0 Update maintenance_loot.dm 
Double the amount of peaches that spawn within Maintenance
 2019-08-15 07:24:09 -05:00
Raptorizer
a6d10885ec Revert "Update maintenance_loot.dm" 
This reverts commit 087bca85e8.
 2019-08-15 07:11:57 -05:00
Raptorizer
087bca85e8 Update maintenance_loot.dm 
Double the amount of canned peaches that spawn within maintenance
 2019-08-15 07:08:27 -05:00
kevinz000
a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals 
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
 2019-08-11 10:15:49 -07:00
Ghommie
efe72ce973 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-09 06:47:27 +02:00
kevinz000
277971971f s 2019-08-07 13:07:38 -07:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains. 
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
 2019-07-28 17:31:59 +01:00
Sishen
1a92134ad3 b 2019-07-25 21:43:02 -04:00
Ghommie
6000f96dbc deleted some boolean variables in favor of bitflags. 2019-07-24 02:00:30 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
Thalpy
f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
kevinz000
b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 
Refactoring underwear to allow custom color preferences.
 2019-07-14 03:38:45 -07:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
c012418cf7 Merge pull request #8734 from Ghommie/Ghommie-cit84 
Sort of porting "Changes the type pathing of some "random" items"
 2019-07-12 07:43:12 -07:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
TrilbySpaceClone
9d6c930b2c owo 
Wat dis?
 2019-06-30 15:47:45 -04:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Ghommie
ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00