shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,206 Commits 5 Branches 0 Tags
353c13631a39f8cd873a41a1fc20eae94243ebbf
Commit Graph
12165 Commits
Author SHA1 Message Date
kevinz000andGitHub 353c13631a Update beam_rifle.dm 2020-02-06 23:34:33 -07:00
kevinz000andGitHub 54d70cd9fe Update gun.dm 2020-02-03 18:33:24 -07:00
kevinz000andGitHub 1a439b8758 Update stun.dm 2020-01-29 20:51:31 -07:00
kevinz000andGitHub 0612649eb7 Update stun.dm 2020-01-29 20:50:06 -07:00
kevinz000andGitHub 9df12f94d4 Merge branch 'master' into one_last_taser_attempt 2020-01-29 16:27:58 -07:00
GhomandGitHub f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01: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 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
kevinz000andGitHub 9dfcef68ed Merge branch 'master' into duke_moxley 2020-01-28 17:53:08 -07:00
kevinz000andGitHub f430fbcbd6 doubles stutter 2020-01-28 17:48:56 -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
kevinz000 4c2b0a826a WEW LAD 2020-01-27 23:26:24 -07:00
kevinz000 d89b8d95cf BRAINLETMOMENT 2020-01-27 22:44:51 -07:00
kevinz000 3ce1fe2585 changes 2020-01-27 22:26:43 -07:00
kevinz000 9d047f07f8 separate this a bit 2020-01-27 21:08:47 -07:00
kevinz000 57b977c2e5 why 2020-01-27 20:41:45 -07:00
kevinz000 7d53d6e162 s 2020-01-27 20:24:02 -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
kevinz000 7ae43a2249 fix 2020-01-27 17:51:59 -07:00
kevinz000andGitHub c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00
kevinz000andGitHub 91e8bec81a woops 2020-01-27 17:45:13 -07: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
kevinz000 0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -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
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 68227dcdb1 Update misc.dm 2020-01-27 03:53:50 -07:00