shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,179 Commits 5 Branches 0 Tags
e985d21ea322c3aebf16ba99b652ec0ea9c726e4
Commit Graph
18728 Commits
Author SHA1 Message Date
Hatterhat e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
Hatterhat 471deba88c large rcd carts 5head 2020-02-01 13:26:43 -06:00
Hatterhat 81cf670729 shit whoops 2020-02-01 13:22:16 -06:00
Hatterhat be525e3f58 good ol twoliner prs 2020-01-31 20:05:27 -06:00
LinandGitHub cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 
demodularize and removes lot of unused clothing with missing sprites.
 2020-01-29 19:58:26 +00:00
LinandGitHub 293e6576c8 Merge pull request #10564 from kevinz000/optimization_1 
Experimental optimizations
 2020-01-29 19:25:13 +00:00
r4d6 c57dedd808 fix 2020-01-29 12:30:05 -05:00
GhomandGitHub 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
GhomandGitHub dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender 
Makes gender change potion not work on people with pref
 2020-01-29 05:31:18 +01:00
GhomandGitHub 44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
GhomandGitHub 3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1 
traitor+bro now have a minimum population of 25
 2020-01-29 02:16:38 +01:00
GhomandGitHub cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4 
[s] more reasonable reagent logging
 2020-01-29 01:59:09 +01:00
kevinz000andGitHub d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2 
Makes transfer_ckey() less pedant.
 2020-01-28 17:59:00 -07:00
Putnam3145andGitHub 6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7 
[s] botany logging
 2020-01-28 16:57:50 -08:00
kevinz000andGitHub 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
Putnam3145andGitHub a00d1fb05e Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5 
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
 2020-01-28 16:56:50 -08:00
kevinz000andGitHub 96df844aa3 Merge pull request #10754 from MalricB/Virgomangood 
Reunites Shaggy (hair from virgo) with Scooby Terrowin
 2020-01-28 17:56:11 -07:00
kevinz000andGitHub 3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3 
An oversight with one of the new area helper procs.
 2020-01-28 17:55:39 -07:00
GhomandGitHub fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01:00
GhomandGitHub fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
kevinz000andGitHub a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
Putnam cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
GhomandGitHub 2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin 
Adds mammal mutation toxin to green slime extract recipes
 2020-01-28 04:06:01 +01:00
Putnam3145andGitHub 209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530 
...? ...? (masked human mob examine pet peeve)
 2020-01-27 19:02:13 -08:00
GhomandGitHub 362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
Winter Flare 5883124e0d Removals. 
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
 2020-01-27 20:47:28 -05:00
Ghommie 5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
Winter Flare 24388f4fc1 Reverts Path changes. 2020-01-27 20:30:06 -05:00
GhomandGitHub f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT 
Spinfusors are no longer purchasable from cargo
 2020-01-28 02:18:32 +01:00
kevinz000andGitHub 5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531 
Refactoring APTFT altclick/verb options into flags
 2020-01-27 17:44:20 -07:00
kevinz000andGitHub 3055c2b4c1 Merge pull request #10742 from Ghommie/Ghommie-cit532 
Fixes det revolver being risky to use.
 2020-01-27 17:43:46 -07:00
Winter Flare 6e7d079928 Changed Dirty Mags and Candle 2020-01-27 19:34:33 -05:00
kevinz000andGitHub 54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
GhomandGitHub 0ed72c7722 Merge pull request #10692 from Citadel-Station-13/TESTING 
faster get_hearers_in_view/getallcontents i guess
 2020-01-27 21:06:52 +01:00
CygnusB 675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin 
self-insert baby pr florida man tries to merge his hair back into citadel
 2020-01-27 15:51:38 -03:00
GhomandGitHub 5dc92f3968 Merge pull request #10733 from Hatterhat/fine-i'll-do-it-myself 
the zombie powder nerf - tgstation#46931
 2020-01-27 17:34:58 +01:00
Winter Flare 5bc590ad52 Merge branch 'master' into cargocratetglass 2020-01-27 08:03:30 -05:00
Winter Flare 21fe8be5dc Mmmmm, more crates. 
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
 2020-01-27 07:00:40 -05:00
kevinz000andGitHub 74fb726b8d Update traitor_bro.dm 2020-01-27 03:27:09 -07:00
GhomandGitHub 1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark 
drake armor goliath resistance
 2020-01-27 05:45:03 +01:00
GhomandGitHub 6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8 
buffs door crushing
 2020-01-27 05:38:59 +01:00
GhomandGitHub 9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief 
Relief valve fixes
 2020-01-27 05:37:53 +01:00
GhomandGitHub 7b49d4842a Fire alarms. 2020-01-27 05:05:08 +01:00
necromanceranne 52b1f63941 Literally just kills spinfusors 2020-01-27 12:32:40 +11:00
Ghommie b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +01:00
GhomandGitHub 27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9 
is_ctf_target now checks for innate faction var rather than clothing
 2020-01-27 00:14:32 +01:00
kevinz000andGitHub f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
kevinz000andGitHub b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation 
made engine rotation properly blacklist 0-weighted ones
 2020-01-26 14:04:31 -07:00
Ghommie 41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
GhomandGitHub 17ea82afd6 Update vr_sleeper.dm 2020-01-26 17:25:24 +01:00