shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,080 Commits 5 Branches 0 Tags
4e68eebe2a03ed6ea78375b98612355d1aa2d09a
Commit Graph

19080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trilbyspaceclone
4e68eebe2a Grammar isnt a thing cats do 2019-02-14 19:09:57 -05:00
Trilbyspaceclone
0379bd2b89 grammar what is that? 2019-02-14 17:10:45 -05:00
Trilbyspaceclone
e1dc0ef51b Update uplink_items.dm 2019-02-14 17:03:42 -05:00
Trilbyspaceclone
d74299ca8a Fixing updater 2018-12-13 13:54:03 -05:00
Trilbyspaceclone
411ba82ba5 Merge pull request #9 from Citadel-Station-13/master 
Updater
 2018-12-11 17:10:12 -05:00
izzyinbox
ece617e40d Revert "doubles the max say/emote size to match the RP server (#7807)" (#7810) 
This reverts commit 6b34cbe5ed.
 2018-12-11 01:59:21 -08:00
izzyinbox
6b34cbe5ed doubles the max say/emote size to match the RP server (#7807) 2018-12-11 01:53:43 -08:00
deathride58
3775ba4c3a Merge pull request #7789 from Citadel-Station-13/kevinz000-patch-17 
Obfuscates the map vote (only during the voting period)
 2018-12-10 19:27:40 -05:00
deathride58
abdf3b2cd9 Merge pull request #7800 from Citadel-Station-13/kevinz000-patch-19 
xeno tackles now hardstun for 3 seconds if someone is not lying down
 2018-12-10 19:26:58 -05:00
deathride58
87f10ae5c5 Merge pull request #7801 from Citadel-Station-13/kevinz000-patch-20 
xenomorph neurotoxin now always hard stuns for 3 seconds, and do 25 stamina because honestly the stamina rework destroyed a major antagonist and it is sad
 2018-12-10 19:25:52 -05:00
nik707
f4c022d076 Merge pull request #7795 from Trilbyspaceclone/patch-21 
Syndicate bombs (The drink) can now spawn in snack vests
 2018-12-10 16:55:06 -06:00
nik707
cae30f90ad Merge pull request #7799 from R3dtail/new_carpet 
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
 2018-12-10 16:45:38 -06:00
nik707
1960947d25 Merge pull request #7803 from Trilbyspaceclone/patch-23 
Adds in white crayons to art crate.
 2018-12-10 16:44:25 -06:00
nik707
971ba21931 Merge pull request #7802 from Citadel-Station-13/kevinz000-patch-21 
the one item designed to hard counter kudzu no longer takes 1/2 of your stamina bar to take down one block of fireproofing kudzu
 2018-12-10 16:43:03 -06:00
Trilbyspaceclone
a58da4c1c8 Update all_nodes.dme.dm 2018-12-09 14:09:04 -05:00
Trilbyspaceclone
3e736dcdf2 adds in white crayons 2018-12-08 17:19:13 -05:00
Redtail
4c7075f1a8 New medals added. 
add:  Two new medals for engineering and medical to give out.
 2018-12-08 12:12:36 -06:00
kevinz000
d049ecaecd Update hydroitemdefines.dm 2018-12-08 04:53:02 -08:00
kevinz000
a347cd14e2 eh 2018-12-08 04:19:41 -08:00
kevinz000
7978daa370 oopsies woopsies i made a fucky wucky 2018-12-08 04:18:57 -08:00
kevinz000
a2f9135951 Update hydroitemdefines.dm 2018-12-08 04:16:04 -08:00
kevinz000
6ba2d56435 Update neurotoxin.dm 2018-12-08 04:14:36 -08:00
kevinz000
f250d6ef94 Update human_defense.dm 2018-12-08 04:13:16 -08:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate. 
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
 2018-12-07 22:48:46 -06:00
Ragolution
1a2a8ec6ae Citadel: The Forgotten Sweaters (#7786) 
Wakes up the sleeping Sweaters hidden in turtlenecks.dm
 2018-12-06 20:57:48 -08:00
Trilbyspaceclone
c9a4a08183 Merge pull request #4 from Trilbyspaceclone/lol 
Makes the glass
 2018-12-06 19:27:15 -05:00
Trilbyspaceclone
4ad2b4d070 Makes the glass 2018-12-06 19:26:37 -05:00
Trilbyspaceclone
964f2f75d3 triv rethink 2018-12-06 18:39:01 -05:00
Trilbyspaceclone
5f3d9cfa7e syndicate bombs can now spawn in snack vests 2018-12-06 18:24:46 -05:00
nik707
bce54df085 Merge pull request #7785 from Qfunk4d/patch-3 
Update chat_commands.dm
 2018-12-06 00:02:25 -06:00
CitadelStationBot
2e675089a8 Automatic changelog generation for PR #7791 [ci skip] 2018-12-05 23:59:34 -06:00
nik707
100328f823 Merge pull request #7791 from deathride58/fixeswavedashing 
Nerfs wavedashing
 2018-12-05 23:59:31 -06:00
deathride58
b230f1a1ea Fixes wavedashing 2018-12-05 19:49:14 -05:00
kevinz000
5e96cc492e Update ticker.dm 2018-12-04 20:30:15 -08:00
Trilbyspaceclone
17b5a6061a Cargo Hardsuit Packets as well as a pare of soft suits (DPO) (#7767) 
* Hardsuits and a set of softs

* Ups sec suit to 3000 do to it being a sec suit

* DropPodOnly!

* Woops

* Kev wishes
 2018-12-04 18:14:04 -08:00
Trilbyspaceclone
dd0dfb7517 Buffs COC and Capo sword (#7762) 
* buffs COC and Capo sword

* Update misc.dm
 2018-12-04 08:09:52 -08:00
deathride58
6ec059ecfa Merge pull request #7784 from nik707/buildmode 
Fixes buildmode, probably.
 2018-12-04 00:29:02 -05:00
Qfunk4d
cfc74acc48 Update chat_commands.dm 
even more new words
 2018-12-03 19:49:20 -07:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA 
Adds a new PKA to the mining Vendor
 2018-12-03 11:20:37 -05:00
CitadelStationBot
0ae4351293 Automatic changelog generation for PR #7782 [ci skip] 2018-12-03 09:54:43 -06:00
nik707
8589eb3650 Merge pull request #7782 from deathride58/longbonespears 
Buffs bone spears by increasing their reach to 2 whole tiles
 2018-12-03 09:54:39 -06:00
CitadelStationBot
325b6fb323 Automatic changelog generation for PR #7781 [ci skip] 2018-12-03 07:24:25 -06:00
nik707
e4c11cbfa4 Merge pull request #7781 from deathride58/fixesstaminahudbutton 
Fixes the stamina hud button - makes it possible to actually click the stamina hud button and fixes the stamina buffer stats displayed by the stamina hud button
 2018-12-03 07:24:22 -06:00
CitadelStationBot
dfb26da4f9 Automatic changelog generation for PR #7783 [ci skip] 2018-12-02 21:52:05 -06:00
nik707
036757488d Merge pull request #7783 from R3dtail/new_carpet 
Added a new carpet
 2018-12-02 21:52:03 -06:00
nik707
23b7795039 untested lmao 2018-12-02 19:47:38 -06:00
R3dtail
fdaf7c3ac1 Added back in the t 
Don't know what happened to the T.  But it's back now!
 2018-12-02 13:35:56 -06:00
Redtail
e339bcd2ca Added a new carpet 
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
 2018-12-01 20:21:18 -06:00
nik707
2f79c609a5 Merge pull request #7777 from Citadel-Station-13/kevinz000-patch-13 
Rebuffs reactive armor because giving the repulse (!!!) armor 20 seconds and the nerfed tesla armor (!!!) 15 seconds is pretty stupid.
 2018-12-01 19:49:34 -06:00
CitadelStationBot
58b900fb0e Automatic changelog generation for PR #7779 [ci skip] 2018-12-01 19:49:24 -06:00