shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

191 Commits

Author SHA1 Message Date
kevinz000
fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
kevinz000
277971971f s 2019-08-07 13:07:38 -07:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
BlackMajor
1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
BlackMajor
9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor
4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
BlackMajor
e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12:00
Fermi
336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Thalpy
5287f3f9c7 Merge branch 'master' into pr/7 2019-05-10 02:20:19 +01:00
Thalpy
b21599a151 Don't overwrite admins 2019-04-24 17:35:07 +01:00
Fermi
390f9a635f Error message addition. 2019-04-16 23:03:24 +01:00
Poojawa
ebc9c6d8f0 attempts to make slime sprites equally transparent 
also gives them snouts and markings for improvments
 2019-04-04 22:01:52 -05:00
Tupinambis
e5e97302d4 Adds a new security level: Amber (#7976) 
* Adds the Amber security level.

* This isn't C
 2019-02-05 17:53:58 -08:00
deathride58
104a3406a0 Makes the server tagline a config option 2019-01-08 16:19:12 -05:00
deathride58
a93751bc03 adds the ability to actually vote for maps instead of using tg's biased preference-based voting system (#7743) 2018-11-19 20:10:25 -08:00
Tupinambis
a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
deathride58
cbc21fe8db okay, let's watch the population drop - adds a config option that makes all stamina buffer actions free (TG-style gameplay) (#7608) 
* "sTAM BAD REE" is like sandpaper on my nerves. so let's turn the server into a TG clone for a week and watch as the population dwindles to nothing just to prove a point!

* and the config, too
 2018-11-09 19:10:20 -08:00
deathride58
50c604acc5 might as well since the pr touches this file 2018-11-06 02:07:14 -05:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
LetterJay
344c09644e Merge pull request #7530 from Citadel-Station-13/updatestitlescreenreadme 
updates the title screen config readme to account for the 7:5 lobby
 2018-10-03 22:30:43 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
62813d4392 Fixes Preference related issues 
Also fixes headpatting & tail checks in general
 2018-09-14 03:06:21 -05:00
Poojawa
235bbae157 ports BSQL to go along with tools 
There, now you can shut up about it not being ported you meme
 2018-09-05 23:45:53 -05:00
deathride58
892b73e9c6 updates the title screen config dir to account for the 7:5 lobby 2018-09-02 02:41:01 -04:00
Tupinambis
02a86dd2a0 New Alien Lavaland Ruin (#7455) 
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
 2018-08-23 00:26:32 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
65e2d7695b Merge pull request #7152 from LetterN/patch-3 
removes extra circuit config
 2018-07-06 01:42:38 -04:00
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
Letter N
0bd2d9e6fe Update game_options.txt 2018-06-18 14:58:13 +08:00
deathride58
b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
Jordan Brown
7be9b6ebf9 Antag reputation rewards are now configurable 2018-06-03 09:03:51 -05:00
Jordan Brown
db20e34d76 Adds config for monkey cap 2018-05-31 22:41:12 -05:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox 
Query debug logging
 2018-05-17 21:38:41 -05:00
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 
[MIRROR] Replaces loose tech storage boards with spawners
 2018-05-15 06:53:25 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
deathride58
0c1f12dc5c Update game_options.txt 2018-05-10 23:48:28 -04:00
oranges
e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Jordan Brown
d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER 
H.O.G.A.N. lawset
 2018-05-01 15:40:09 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa
95b78a4a77 misc 2018-04-22 23:46:15 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
KorPhaeron
46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
Jordan Brown
4bd86b8c72 Merge pull request #36906 from tgstation/KorPhaeron-patch-1 
Adds missing mood config option
 2018-04-02 08:37:23 -05:00
LetterJay
5dbb046757 Merge pull request #6131 from deathride58/gearIDwhitelists 
Adds support for manipulating gear entries via config
 2018-04-02 05:50:10 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00