shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,197 Commits 5 Branches 0 Tags
952d2e1e60384382ff7c284f9c052bd3e13a2dfd
Commit Graph

41197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
keronshb
952d2e1e60 Removes the power sink objective 
Alternative to the other PR
 2021-02-07 23:41:27 -05:00
keronshb
e46652eb39 Merge remote-tracking branch 'upstream/master' 2021-02-07 20:19:08 -05:00
Changelogs
936abbd9f0 Automatic changelog compile [ci skip] 2021-02-07 00:13:52 +00:00
CitadelStationBot
1dd9ec4fd0 Automatic changelog generation for PR #14189 [ci skip] 2021-02-06 12:42:39 -06:00
silicons
cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound 
Diversify weapon sound
 2021-02-06 11:42:36 -07:00
CitadelStationBot
874de99056 Automatic changelog generation for PR #14179 [ci skip] 2021-02-06 12:42:27 -06:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master 
Signed language (Requested changes complete)
 2021-02-06 11:42:24 -07:00
CitadelStationBot
2d4e0c6b5b Automatic changelog generation for PR #13966 [ci skip] 2021-02-06 12:41:12 -06:00
silicons
08356ee7f7 Merge pull request #13966 from Thalpy/Dispencer-UI-change 
[Ready] Fixes and tweaks for the chemistry machine suite
 2021-02-06 11:41:08 -07:00
deathride58
2ebbef4a63 Merge pull request #14197 from timothyteakettle/sanitize-your-text 
[s] sanitize your text
 2021-02-06 13:02:16 -05:00
timothyteakettle
a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
CitadelStationBot
c95896b473 Automatic changelog generation for PR #13890 [ci skip] 2021-02-05 23:52:20 -06:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry 
ablative parry armwraps
 2021-02-05 23:52:18 -06:00
Fermi
bd959877a5 Updates tgui 2021-02-06 02:46:11 +00:00
Fermi
f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Fermi
1498130072 Merge remote-tracking branch 'upstream/master' 2021-02-06 01:17:41 +00:00
DeltaFire
bbcf23fae9 Merge pull request #14182 from Citadel-Station-13/silicons-patch-8 
i hate xenobiology players
 2021-02-05 16:09:58 +01:00
dzahlus
2322652d48 haha oops forgotthis existed 2021-02-05 13:04:11 +01:00
silicons
3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-02-05 00:59:19 -07:00
Changelogs
02e9ce07c2 Automatic changelog compile [ci skip] 2021-02-05 00:13:56 +00:00
CitadelStationBot
27b0e3264b Automatic changelog generation for PR #14159 [ci skip] 2021-02-04 16:04:12 -06:00
DeltaFire
df3f4a7ca6 Merge pull request #14159 from raspy-on-osu/ventcrawling-refactor-fix2 
Fixes Alien Royals being able to ventcrawl
 2021-02-04 23:04:09 +01:00
raspy-on-osu
a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu
3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
DeltaFire
d364fdbc6d Merge pull request #14193 from Citadel-Station-13/silicons-patch-9 
sanitizes id cards
 2021-02-04 21:26:50 +01:00
silicons
89c63a243f Update card.dm 2021-02-04 13:23:03 -07:00
TyrianTyrell
d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00
TyrianTyrell
fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrell
7ffbc07e03 Update preferences.dm 2021-02-04 15:08:32 -05:00
TyrianTyrell
26d911a643 Update preferences.dm 2021-02-04 15:07:52 -05:00
TyrianTyrell
44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
silicons
9d4444d512 Merge pull request #14188 from zeroisthebiggay/godimsoscuffed 
i forgot a sprite
 2021-02-04 12:57:43 -07:00
CitadelStationBot
29362c7cfa Automatic changelog generation for PR #14183 [ci skip] 2021-02-04 13:56:05 -06:00
silicons
055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard 
dwarf facial hair is no longer randomised
 2021-02-04 12:56:01 -07:00
CitadelStationBot
91f027acf9 Automatic changelog generation for PR #14174 [ci skip] 2021-02-04 13:53:17 -06:00
silicons
497c6b8d2c Merge pull request #14174 from keronshb/meathook-adjustment 
Meathook Adjustments
 2021-02-04 12:53:14 -07:00
CitadelStationBot
af488711d0 Automatic changelog generation for PR #14172 [ci skip] 2021-02-04 13:50:32 -06:00
silicons
d4f978c6db Merge pull request #14172 from keronshb/cell-charger-upgrade 
Cell Charger Buffs
 2021-02-04 12:50:30 -07:00
CitadelStationBot
e5e2c2d303 Automatic changelog generation for PR #14170 [ci skip] 2021-02-04 13:50:22 -06:00
silicons
a3fc6b7f80 Merge pull request #14170 from SmArtKar/firer_fix 
Fixes KAs being broken by circuits
 2021-02-04 12:50:19 -07:00
CitadelStationBot
bcb6755c33 Automatic changelog generation for PR #14155 [ci skip] 2021-02-04 13:49:13 -06:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe 
Port of TG's "Auto Observe"
 2021-02-04 12:49:09 -07:00
CitadelStationBot
ddacd75efe Automatic changelog generation for PR #14132 [ci skip] 2021-02-04 13:45:14 -06:00
silicons
bec5d6d8a3 Merge pull request #14132 from shellspeed1/salt-nerf-romerol 
MASSIVE SALT NERF
 2021-02-04 12:45:11 -07:00
Fermi
fe3dbb32ba Removes buffer from dispensers 2021-02-04 01:13:08 +00:00
dzahlus
1977a1360a empty commit 2021-02-03 23:50:03 +01:00
dzahlus
c896d50e56 get hardscoped 
new weapon sounds for the sniper rifle and the AT pistol
 2021-02-03 22:29:08 +01:00
dzahlus
6da6c0749c gunshotshotgunshot.ogg 
Yeah I use the gunshotshotgunshot you know why? Also fixes firing_sound erro to fire_sound on surplus rifle
 2021-02-03 22:14:27 +01:00
dzahlus
2ffe5dda10 RIFLEMAN 300m FRONT 
BRO WHERE I CANT FUCKING SEE SHIT FUCKING TERMINATOR AI. Adds unique rifle sounds for AR, M90 and Mosin.
 2021-02-03 21:35:49 +01:00
dzahlus
33b3122bd4 LMG MOUNTED AND LOADED 
new L6 SAW sounds
 2021-02-03 21:14:01 +01:00