shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,448 Commits 5 Branches 0 Tags
eae147f6a3474f224a45ea0592918fcc3d9688fa
Commit Graph

44448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
eae147f6a3 Automatic changelog generation for PR #15063 [ci skip] 2021-09-10 02:16:57 -05:00
silicons
fd785c6abf Merge pull request #15063 from zeroisthebiggay/intern 
ports various tg armor resprites and some such
 2021-09-10 00:16:54 -07:00
CitadelStationBot
8c845134fb Automatic changelog generation for PR #15097 [ci skip] 2021-09-10 02:16:28 -05:00
silicons
4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr 
Generic syncs
 2021-09-10 00:16:25 -07:00
Lin
4883a93da1 Merge pull request #15092 from lolman360/patch-1 
allows autohydro trays to be manually filled
 2021-09-09 20:21:40 -05:00
Lin
9efb28c208 Merge pull request #15107 from Citadel-Station-13/silicons-patch-8 
makes techweb error nodes stack trace
 2021-09-09 20:08:48 -05:00
Lin
a1a6414777 Merge pull request #15096 from Citadel-Station-13/movespeed 
Tweaks reagent speedups and taser slowdowns and fixes stabilzied light pink for those xenobio people
 2021-09-09 20:08:35 -05:00
Lin
43faf70d6a Merge pull request #15088 from Citadel-Station-13/silicons-patch-4 
how did no one notice ephedrine (see: every painkiller speedup buff which uses the same system) was broken until i abused it and got to be the beta tester?
 2021-09-09 20:08:22 -05:00
CitadelStationBot
1e30ed46dc Automatic changelog generation for PR #15103 [ci skip] 2021-09-09 19:59:50 -05:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers 
Does some nice stuff on cyborg grippers
 2021-09-09 17:59:47 -07:00
CitadelStationBot
0387a3dd2d Automatic changelog generation for PR #15111 [ci skip] 2021-09-09 19:59:08 -05:00
silicons
19db32bf22 Merge pull request #15111 from Putnam3145/update-auxmos-again 
Updates auxmos not to crash
 2021-09-09 17:59:05 -07:00
CitadelStationBot
0d6ed307fe Automatic changelog generation for PR #15110 [ci skip] 2021-09-09 19:58:25 -05:00
silicons
bf08d7e8f2 Merge pull request #15110 from timothyteakettle/arachnid-legs 
arachnid legs now show up properly
 2021-09-09 17:58:23 -07:00
Lin
0a005438ab Merge pull request #15100 from Citadel-Station-13/silicons-patch-5 
salt fixes colossus crystals not reading direction anymore due to a projectile update
 2021-09-09 19:51:05 -05:00
Changelogs
16957aa6b6 Automatic changelog compile [ci skip] 2021-09-10 00:28:22 +00:00
Lin
3f09f56e3d Merge pull request #15101 from Citadel-Station-13/silicons-patch-6 
fixes the comedy antag parry gauntlets
 2021-09-09 19:10:51 -05:00
Putnam3145
9d4d50fc5e Updates auxmos not to crash 2021-09-09 10:46:06 -07:00
Timothy Teakettle
65e942ef4e Update arachnid_parts.dmi 2021-09-09 18:15:29 +01:00
silicons
ead04910c2 Update preferences_savefile.dm (#15108) 2021-09-09 18:23:01 +02:00
zerothebigboy
bae9ede2ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern 2021-09-09 08:20:05 -04:00
silicons
eca14faa92 Merge pull request #15065 from zeroisthebiggay/vesties 
ports tg hazard vest
 2021-09-09 05:19:27 -07:00
zerothebigboy
f14186cec2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vesties 2021-09-09 08:17:53 -04:00
zerothebigboy
c7e16aabf8 ihatekeroncoats 2021-09-09 04:56:42 -04:00
zerothebigboy
5a8a069cd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/mob/clothing/suit_digi.dmi
#	icons/obj/clothing/suits.dmi
 2021-09-09 04:49:30 -04:00
silicons
448199665d Update research.dm 2021-09-08 23:10:24 -07:00
silicons
6b503904a7 Merge pull request #15093 from LetterN/patch-9 
Readme Update
 2021-09-08 21:45:17 -07:00
CitadelStationBot
23e10d2fe6 Automatic changelog generation for PR #15056 [ci skip] 2021-09-08 23:17:03 -05:00
keronshb
4f54c465b2 ReebeReturns (#15056) 2021-09-09 06:17:00 +02:00
CitadelStationBot
cb4ba0b02a Automatic changelog generation for PR #15039 [ci skip] 2021-09-08 22:41:03 -05:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport 
Ports Colorist Quirk and Hair Gradients Preferences
 2021-09-08 20:41:00 -07:00
CitadelStationBot
baa7bd0d5e Automatic changelog generation for PR #15043 [ci skip] 2021-09-08 22:40:43 -05:00
silicons
82103d8c15 Merge pull request #15043 from BlueWildrose/dropitlikeitshot 
CTRL + (combat mode) Right Click - positional dropping and item rotation
 2021-09-08 20:40:41 -07:00
CitadelStationBot
eb88527b6b Automatic changelog generation for PR #15058 [ci skip] 2021-09-08 22:40:23 -05:00
silicons
bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass 
the unatomized hypospray/medbay tools/emergency kits resprite
 2021-09-08 20:40:20 -07:00
CitadelStationBot
6394e9f96d Automatic changelog generation for PR #15069 [ci skip] 2021-09-08 22:40:01 -05:00
silicons
1fd311b983 Merge pull request #15069 from zeroisthebiggay/flashes 
tgifies the cyborg tools
 2021-09-08 20:39:59 -07:00
CitadelStationBot
60083b9823 Automatic changelog generation for PR #15064 [ci skip] 2021-09-08 22:39:48 -05:00
silicons
ff28789f27 Merge pull request #15064 from zeroisthebiggay/hammers 
tg hammers port uwu
 2021-09-08 20:39:46 -07:00
silicons
2002532e1f Merge pull request #15090 from Putnam3145/making-lavaland-atmos-better 
Removes flammable gases from planet atmos
 2021-09-08 20:39:39 -07:00
CitadelStationBot
04a989bc11 Automatic changelog generation for PR #15089 [ci skip] 2021-09-08 22:39:32 -05:00
silicons
9968d92bdc Merge pull request #15089 from keronshb/maskofmadness 
Mask of Madness no longer wallhacks
 2021-09-08 20:39:30 -07:00
silicons
7eaec9f6cc Merge pull request #15095 from Putnam3145/thread-MC 
Allow atmos thread to slow itself down
 2021-09-08 20:39:09 -07:00
silicons
316278be7a Merge pull request #15098 from Citadel-Station-13/dependabot/pip/tools/pillow-8.3.2 
Bump pillow from 8.2.0 to 8.3.2 in /tools
 2021-09-08 20:39:00 -07:00
silicons
a6ace3194f Merge pull request #15104 from Putnam3145/pipes-dont-explode 
Zaps don't explode pipes
 2021-09-08 20:38:48 -07:00
Putnam3145
5eb272c0a6 Makes it so zaps don't explode pipes 2021-09-08 18:42:38 -07:00
SandPoot
759852a31d Update inventory.dm 2021-09-08 20:02:23 -03:00
SandPoot
37e2470616 Upload files 2021-09-08 19:53:47 -03:00
silicons
7d62753fe4 Update living_active_parry.dm 2021-09-08 04:44:36 -07:00
silicons
5de5be462f Update colossus.dm 2021-09-08 02:36:40 -07:00