shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

181 Commits

Author SHA1 Message Date
Rohesie
5ab8d41d9a horns (#12384) 2020-05-30 03:25:27 +02:00
Lin
ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2 
Refactors projectile speed to pixels per second
 2020-05-24 21:21:41 +00:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
kevinz000
6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
Ghommie
3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
Ghommie
42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie
c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Ghommie
586966ea51 General refactor for some snowflake bodyparts procs and taurs. 2020-04-16 03:37:52 +02:00
necromanceranne
8af29a178c Hooks up the chaplain null rod gloves to the choice of gloves 2020-04-04 16:42:37 +11:00
Ghommie
97ad47f3fd Fixing an inconsistency with nuclear bombs exploding on station level space. 2020-03-23 22:40:02 +01:00
Ghommie
5d6eb6f24b Patches some awful integrated circuit examiner runtime errors. 2020-03-06 14:56:49 +01:00
Ghommie
0d67e81ad5 Yo. 2020-02-23 13:18:16 +01:00
Seris02
c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857) 
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????

* fix

* no more getflaticon dabdabdabdabdabdabdab

* tada
 2020-02-16 07:31:30 +01:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000
884ea59d63 fix logic 2020-01-12 18:38:22 -08:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
kevinz000
8e1affa1f5 nightshift changes 2020-01-02 23:56:40 -08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Ghommie
0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
kevinz000
4970675467 s 2019-12-15 00:06:11 -07:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
Ghommie
4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie
d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00
Ghommie
09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
kevinz000
906c58d339 Merge pull request #9672 from Ghommie/Ghommie-cit299 
Obligatory changes for 513 support kevinz forgot about.
 2019-11-03 06:15:42 -07:00
Ghommie
05dc64fd0a Obligatory changes for 513 kevinz forgot about. 2019-10-30 21:47:33 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Poojawa
66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Ghommie
475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Poojawa
bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Ghommie
fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" 2019-10-07 23:58:15 +02:00