shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,973 Commits 5 Branches 0 Tags
e588b504c1b207fdcd322c2aeeb2f31be4aa4e27
Commit Graph
1802 Commits
Author SHA1 Message Date
kevinz000 d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
Winter Flare c97111beda Reorganise Food + Balance Tweaks 
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
 2020-02-17 05:32:03 -05:00
LinandGitHub 794aeb81c2 Merge pull request #11060 from kevinz000/stuff 
guns and cult blood magic now respect stamina softcrit
 2020-02-16 13:20:56 -06:00
Seris02andGitHub c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857) 
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????

* fix

* no more getflaticon dabdabdabdabdabdabdab

* tada
 2020-02-16 07:31:30 +01:00
kevinz000andGitHub b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
kevinz000andGitHub 6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 
Doubled halved flavor text max length and removed crappy code.
 2020-02-15 11:46:00 -07:00
kevinz000andGitHub 24b977f655 Merge branch 'master' into stuff 2020-02-15 11:45:25 -07:00
Seris02 2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08:00
Ghommie 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
kevinz000andGitHub 02b7764e9b Merge pull request #11092 from Citadel-Station-13/Ghommie-patch-3-1 
Something about a PR, simple mathematical expressions and SSmobs wait value.
 2020-02-14 11:38:32 -07:00
GhomandGitHub 1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
GhomandGitHub da4d13934a Update DNA.dm 2020-02-14 13:52:05 +01:00
GhomandGitHub 4512845fc3 Merge pull request #11062 from Citadel-Station-13/kevinz000-patch-10 
Changes to organ decay rate (tip it's not 15 minutes 0-100 damage and this was lying to you)
 2020-02-14 13:36:39 +01:00
kevinz000 3865224e78 fine 2020-02-13 15:40:30 -07:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
GhomandGitHub a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler 
ports auto profiler subsystem from tg
 2020-02-13 15:06:27 +01:00
GhomandGitHub 7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7 
STOP_PROCESSING now also removes from currentrun
 2020-02-13 15:05:51 +01:00
Ghommie 315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000andGitHub 5d3f39b1ae Update DNA.dm 2020-02-13 05:39:59 -07:00
kevinz000 c1f59512da Merge branch 'stuff' of github.com-kevinz000:kevinz000/Citadel-Station-13 into stuff 2020-02-13 04:15:37 -07:00
kevinz000 863ce5152b Merge remote-tracking branch 'citadel/master' into stuff 2020-02-13 04:14:44 -07:00
kevinz000andGitHub 4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571 
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
 2020-02-13 04:11:01 -07:00
kevinz000andGitHub 4b2624b932 Update interaction_flags.dm 2020-02-13 03:09:56 -07:00
kevinz000andGitHub 9331b26a21 Update DNA.dm 2020-02-13 01:42:27 -07:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 a8a071851a s 2020-02-13 00:32:26 -07:00
kevinz000andGitHub 4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567 
Something about missing privates sprites and bad code.
 2020-02-12 23:56:53 -07:00
Detective Google b6cbb3f505 woo yeah yeah woo 2020-02-13 00:12:11 -06:00
kevinz000andGitHub ebba56202d Update MC.dm 2020-02-12 01:16:01 -07:00
GhomandGitHub 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port 
Ports /vg/station drink sliding
 2020-02-12 09:06:03 +01:00
Artur a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
kevinz000 275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie 0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
kevinz000 276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
kevinz000 690c14a716 Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:29:22 -07:00
GhomandGitHub c8a62e7acf Merge pull request #10985 from r4d6/Dwarf 
Dwarven Update
 2020-02-10 12:23:23 +01:00
kevinz000andGitHub c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
Ghommie f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
r4d6 5316cc3665 Make dwarves not have an accent when speaking dwarvish 2020-02-08 23:02:32 -05:00
GhomandGitHub f27ce86769 Merge pull request #10942 from Putnam3145/map-vote-options 
Added a config for map voting types
 2020-02-08 23:31:33 +01:00
kevinz000 826ed7d4f2 o k. 2020-02-07 23:39:09 -07:00
Detective Google f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
Putnam 7f0a369870 Also added options for custom votes 2020-02-07 04:29:53 -08:00
Artur cf22596477 Reworks solars 2020-02-07 10:59:43 +02:00
Seris02 4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000andGitHub 62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul 
Better antag objectives: for real this time
 2020-02-06 16:25:22 -07:00
Ghommie 0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
GhomandGitHub ce6b37da1e Merge pull request #10920 from Arturlang/debbuging 
Adds vscode debbuging
 2020-02-06 20:33:21 +01:00
kevinz000andGitHub 542cae89d4 Merge pull request #10906 from Hatterhat/tg-48717-48726 
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
 2020-02-06 00:42:05 -07:00