shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,540 Commits 5 Branches 0 Tags
89466de29ee152e28c19557117c362cdb1fade2d
Commit Graph

18982 Commits

Author SHA1 Message Date
kevinz000
562659b5b8 Update dueling.dm 2020-01-29 19:00:11 -07:00
r4d6
58b969b8c6 Update RPD.dm 2020-01-29 20:34:57 -05:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000
0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf 
Removes stim packs from gangs
 2020-01-29 16:24:51 -07:00
Ghom
f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01:00
kevinz000
0f4e30c2db Update crayons.dm 2020-01-29 16:13:29 -07:00
kevinz000
e3a3c8f241 woops 2020-01-29 15:45:57 -07:00
Hatterhat
41a3dc64d5 what 2020-01-29 16:44:01 -06:00
Lin
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
Lin
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
Seris02
1a40bec44b merge maybe fix 2020-01-29 18:45:21 +08:00
Seris02
e6f8f478d7 prototype 2020-01-29 18:43:15 +08:00
Ghom
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
Ghom
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
necromanceranne
f9d6a9b9c4 Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc 2020-01-29 14:23:50 +11:00
Ghom
44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
Ghom
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
Ghom
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
kevinz000
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
Putnam3145
6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7 
[s] botany logging
 2020-01-28 16:57:50 -08:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
Putnam3145
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
kevinz000
96df844aa3 Merge pull request #10754 from MalricB/Virgomangood 
Reunites Shaggy (hair from virgo) with Scooby Terrowin
 2020-01-28 17:56:11 -07:00
kevinz000
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
kevinz000
9dfcef68ed Merge branch 'master' into duke_moxley 2020-01-28 17:53:08 -07:00
kevinz000
9cf02ac96f moth sounds 2020-01-28 17:36:10 -07:00
KeRSe
9c18d4fdad makes stimulants no longer purchasable by gangs 2020-01-28 15:53:29 -05:00
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
kevinz000
a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
Seris02
feca294f48 tada 2020-01-28 13:56:37 +08:00
Putnam
cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
Ghom
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
Putnam3145
209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530 
...? ...? (masked human mob examine pet peeve)
 2020-01-27 19:02:13 -08:00
Ghom
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
Ghom
f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT 
Spinfusors are no longer purchasable from cargo
 2020-01-28 02:18:32 +01:00
kevinz000
c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00
kevinz000
91e8bec81a woops 2020-01-27 17:45:13 -07:00
kevinz000
5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531 
Refactoring APTFT altclick/verb options into flags
 2020-01-27 17:44:20 -07:00
kevinz000
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
kevinz000
54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
Ghom
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
Ghom
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