shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,845 Commits 5 Branches 0 Tags
face07f53220eecdd7b1b2ebc86ee97f14d73186
Commit Graph

4064 Commits

Author SHA1 Message Date
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
silicons
d2ce6ca709 Merge pull request #13540 from TheObserver-sys/QoLPass 
Service+Plumbing QoL Pass 1:  Beakers, Belts, Plungers and Pipes
 2020-10-10 22:04:49 -07:00
silicons
c3983ee55b Merge pull request #13535 from Hatterhat/energy-sabres 
[READY] Energy Sabers - an elegant esword skin for a more civilized age
 2020-10-10 22:04:17 -07:00
Putnam3145
d8b39bcc5f Merge pull request #13405 from silicons/tracer 
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
 2020-10-10 11:02:30 -07:00
The0bserver
e40e4a79d3 Allows plantbags to hold plantdisks 2020-10-10 08:58:54 -04:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
The0bserver
98f398338a belt fix and icons 2020-10-09 02:34:42 -04:00
The0bserver
0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
Hatterhat
96e55d6233 the last bit 2020-10-07 17:50:21 -05:00
Hatterhat
9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
efc4e089c9 Merge pull request #13503 from Hatterhat/glaive-knuckledagger 
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
 2020-10-06 17:03:44 -07:00
Detective-Google
260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
silicons
9faff5ecb6 Merge pull request #13461 from Detective-Google/arcade-carpets 
adds arcade carpets
 2020-10-03 18:07:44 -07:00
silicons
7586c38d52 Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix 
Fixes borg KA upgrade installation
 2020-10-03 18:03:11 -07:00
silicons
6a8814cd1e Merge pull request #13484 from DeltaFire15/plushling-fix 
Fixes plushlings
 2020-10-03 14:20:33 -07:00
Hatterhat
4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Detective Google
98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
DeltaFire
e012b8f082 typo 2020-10-01 17:18:28 +02:00
DeltaFire
d54a899695 fixes KA modkits being installed in borgs by others 
These have been broken for so long holy fuck
 2020-10-01 17:13:03 +02:00
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2 
Adds craftable railings
 2020-10-01 03:13:51 -07:00
silicons
d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine 
Ascent Port Project: Methane and Methyl Bromide Gas Additions
 2020-10-01 03:13:15 -07:00
silicons
47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors 
Gabbys new wooden floor tile types
 2020-10-01 03:04:21 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Letter N
d9ab31e199 commit 2 2020-10-01 11:30:01 +08:00
Detective Google
643421bc23 adds arcade carpets 
yay
 2020-09-28 14:43:03 -05:00
Tupinambis
f552459f4a 13->14 distro 2020-09-27 17:28:50 -05:00
Tupinambis
d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
silicons
1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans 
Micro Powered Fans!
 2020-09-27 00:03:43 -07:00
ItzGabby
b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
DeltaFire
178be2b643 fixes plushlings 
This makes it so the snowflake id is actually set if the plush is a snowflake, and also makes plushlings not become invisible anymore if they absorb a snowflake plush
 2020-09-25 23:41:18 +02:00
silicons
57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
silicons
9a17c42321 sigh 2020-09-22 01:53:16 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
silicons
97f373a199 whew 2020-09-19 16:17:26 -07:00
silicons
1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes 
Some bodypart-related fixes
 2020-09-19 06:02:32 -07:00
silicons
139c99d82a fix 2020-09-18 00:49:17 -07:00
silicons
4338c0207e fix 2020-09-18 00:37:36 -07:00
silicons
b1738c7230 fix 2020-09-18 00:30:02 -07:00
silicons
d619823b9b ok 2020-09-18 00:27:04 -07:00
silicons
a477b1d5a9 easy?? 2020-09-18 00:24:31 -07:00
Dip
8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00