shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,637 Commits 5 Branches 0 Tags
51dcb044e027245668a7dbf3d7ca6d6a02bcfeec
Commit Graph

367 Commits

Author SHA1 Message Date
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000
47f01907f0 Merge pull request #9666 from Ghommie/Ghommie-cit296 
Shameless late game crew nerf
 2019-11-14 15:54:13 -07:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
kevinz000
1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317 
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
 2019-11-10 11:27:04 -07:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
Ghommie
c6022518a7 Shameless late game crew nerf. 2019-10-30 03:25:50 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
kevinz000
9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271 
Unmodularize events
 2019-10-25 20:07:48 -07:00
Ghommie
6fbe7f9086 unmodularize events 2019-10-24 23:41:31 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
kevinz000
814f91ee8e Merge pull request #9545 from Ghommie/Ghommie-cit248 
Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears"
 2019-10-21 01:07:00 -07:00
Ghommie
964372b047 Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears" 2019-10-20 09:34:16 +02:00
Ghommie
ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2019-10-15 23:11:35 -07:00
Thalpy
ac2aba50a6 Turns Jacq into her own event 2019-10-13 22:33:46 +01:00
kevinz000
53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215 
The niche singularity beacon now also moderately buffs meteor waves.
 2019-10-13 13:56:03 -07:00
Ghommie
c78078bdd4 typo 2019-10-13 06:08:53 +02:00
Fermi
ecfc988911 Okay! 2019-10-12 09:15:32 +01:00
Ghommie
9ee1987dec Applying kevinz' ominous warning suggestion 2019-10-08 20:04:08 +02:00
Ghommie
52fb4b03ac we are only keeping track of the number of singu beacons, var more efficient. 2019-10-05 05:29:57 +02:00
Ghommie
d706944e20 The niche singularity beacon now also moderately buffs meteor waves. 2019-10-05 04:37:01 +02: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
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
BurgerLua
9566caa527 Added 2019-08-08 09:25:04 -07:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01: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
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
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
8f410429de Ports "Renames SSsqueak to SSminor_mapping" 2019-07-13 07:08:03 +02:00
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
deathride58
fca529cb07 Merge pull request #8823 from Ghommie/Ghommie-cit108 
Ports "fixes spontaneous appendicitis picking incompatible biotypes"
 2019-07-08 17:52:49 -04:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie
b501edf9cf Ports "fixes spontaneous appendicitis picking incompatible biotypes" 2019-07-04 22:02:20 +02: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
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
unknown
80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
Ghommie
3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00