shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,756 Commits 5 Branches 0 Tags
40dfd40bcd84759401a6e7e718bf6803db1dc866
Commit Graph

5786 Commits

Author SHA1 Message Date
silicons
21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket 
MWS-01 Changes
 2021-03-06 16:59:46 -07:00
DeltaFire
357853863e Merge pull request #14352 from timothyteakettle/jar-nerf 
exiting a bluespace jar through any means, hardstuns you for 5 seconds
 2021-03-06 03:50:35 +01:00
Putnam3145
43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak 
Removes Superconuctivity from Reinforced Plasma Glass
 2021-03-04 09:33:45 -08:00
keronshb
b105556603 No Superconductivity with Reinforced Plasma Glass 
Removes heat going through RPlasma Glass
 2021-03-02 21:45:36 -05:00
silicons
824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix 
[FIX] More pacifism bug squashing
 2021-03-02 16:57:26 -07:00
timothyteakettle
f0d219e999 Update pet_carrier.dm 2021-03-02 14:26:53 +00:00
timothyteakettle
a5c17eead4 Update pet_carrier.dm 2021-03-02 14:25:44 +00:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
qweq12yt
d3aeb714f1 flamethrowers now can't be used by pacifists 2021-02-28 20:21:19 -03:00
Putnam
50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
silicons
504a36f50d Update holy_weapons.dm 2021-02-24 01:36:03 -07:00
SandPoot
6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
silicons
178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration 
Hyperblade restored to uplink
 2021-02-22 13:10:21 -07:00
Timothy Teakettle
5c2f5cf8a7 Update charter.dm 2021-02-22 17:07:10 +00:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
Lin
dbcc95ea28 Merge pull request #14262 from timothyteakettle/lawyer-message-all-href 
stops people using Message All on PDAs when their cartridge doesn't allow it
 2021-02-18 23:34:11 -06:00
Timothy Teakettle
746ca01823 Update code/game/objects/items/devices/PDA/PDA.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-19 02:10:03 +00:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Lin
3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
 2021-02-17 17:29:03 -06:00
Timothy Teakettle
96d80901e4 Update PDA.dm 2021-02-17 17:26:45 +00:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
keronshb
d87ac38e58 Eutactic Blade Restoration + Hyperblade 
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
 2021-02-15 21:36:47 -05:00
SandPoot
4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui 2021-02-14 20:10:41 -03:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
silicons
76837ee0b6 Merge pull request #14225 from Hatterhat/dth-kit-pass2 
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
 2021-02-12 18:54:36 -07:00
DeltaFire
1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf 
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
 2021-02-12 05:06:48 +01:00
Hatterhat
7ec692ef60 this is good...isn't it? 2021-02-11 19:08:29 -06:00
SandPoot
a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
Hatterhat
8103078ff1 second pass pt2 2021-02-11 00:29:25 -06:00
Hatterhat
3040eca4e0 holy shit what was i thinking god FUCK durathread 2021-02-11 00:20:49 -06:00
silicons
e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
silicons
ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00
silicons
7c27de3735 Merge pull request #14216 from timothyteakettle/blood-fixes 
corrects two persistent blood related issues
 2021-02-10 02:07:49 -07:00
Timothy Teakettle
5ebdb6deec yes 2021-02-09 09:37:17 +00:00
dzahlus
6dabe348fa fixes oversights 
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
 2021-02-08 14:43:33 +01:00
keronshb
38827122e9 Adjusts warp implant to 30 second delay 
who thought this was a good idea
 2021-02-07 23:50:42 -05:00
silicons
cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound 
Diversify weapon sound
 2021-02-06 11:42:36 -07:00
SmArtKar
2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
dzahlus
84207813b7 rework of present sounds 
Reworks already present sounds in the game, specifically of the folder "weapons"
 2021-02-02 23:28:53 +01:00
TyrianTyrell
4f5f0eec07 Update radio.dm 2021-01-31 14:19:04 -05:00
TyrianTyrell
cfa169293c Update radio.dm 2021-01-31 14:17:53 -05:00
TyrianTyrell
318f34be78 Update headset.dm 2021-01-31 14:15:40 -05:00
Hatterhat
4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
silicons
1974f2b41d Merge pull request #14148 from zeroisthebiggay/whytho 
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
 2021-01-29 07:29:28 -07:00
zerothebigboy
e7d8021b81 a 2021-01-27 18:46:11 -05:00