shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,565 Commits 5 Branches 0 Tags
e4e5b651e69e2321ac97b5d89809bed02d405be8
Commit Graph
12337 Commits
Author SHA1 Message Date
Artur db36a90e35 Fixes. 2020-01-30 19:23:38 +01:00
Artur d937ded07c Fixes points 2020-01-30 18:54:39 +01:00
GhomandGitHub d92a67f582 I'm sorry what? 2020-01-30 18:08:43 +01:00
GhomandGitHub 63560e191e A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles. 2020-01-30 18:03:58 +01:00
loginsandylogoutandGitHub 7054e697db spacing 2020-01-30 02:07:59 -06:00
Commandersand 27c915ec75 honk 2020-01-30 02:04:48 -06:00
Seris02 dbb6218e0d merp 2020-01-30 14:54:07 +08:00
Seris02 afb4bebf2d merge conflicts 2020-01-30 12:47:48 +08:00
Seris02 beb90d39a6 polychromic winter coat 2020-01-30 12:44:40 +08:00
kevinz000andGitHub e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
GhomandGitHub c96267eb06 Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9 
CAPTURE THE FLAG NOW HAS CLAYMORES
 2020-01-30 04:01:17 +01:00
GhomandGitHub 96e6e5903d Merge pull request #10783 from r4d6/fix 
AAAAAAH
 2020-01-30 04:00:07 +01:00
r4d6 cd048ebd77 AAAAAAH 2020-01-29 21:50:55 -05:00
Ghommie 05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
kevinz000andGitHub 831fafb72b Update dueling.dm 2020-01-29 19:06:11 -07:00
kevinz000andGitHub 562659b5b8 Update dueling.dm 2020-01-29 19:00:11 -07:00
Ghommie 0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
GhomandGitHub f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01:00
kevinz000andGitHub e3a3c8f241 woops 2020-01-29 15:45:57 -07:00
Hatterhat 41a3dc64d5 what 2020-01-29 16:44:01 -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
Seris02 1a40bec44b merge maybe fix 2020-01-29 18:45:21 +08:00
Seris02 e6f8f478d7 prototype 2020-01-29 18:43:15 +08: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
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
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
kevinz000 9cf02ac96f moth sounds 2020-01-28 17:36:10 -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
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
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 c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00