shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,763 Commits 5 Branches 0 Tags
34697acf741feff6edef0fd074a9d151bf28febe
Commit Graph

9324 Commits

Author SHA1 Message Date
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Letter N dcab40cdb6 building pipeline 2021-03-04 21:51:20 +08:00
Letter N 45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N 7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons 8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07: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
silicons 6f91da89d7 Merge pull request #14322 from Putnam3145/pai-policy 
Adds a pAI policy config
 2021-03-01 18:26:57 -07:00
qweq12yt d3aeb714f1 flamethrowers now can't be used by pacifists 2021-02-28 20:21:19 -03:00
Letter N 573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Letter N c5e8d8131e you're going on the tabl 2021-02-27 17:47:22 +08:00
Putnam 50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
Lin ecc61689f8 Merge pull request #14305 from Citadel-Station-13/silicons-patch-18 
sam dennison you exploit hoarding banana i will shove a barrel of ghost peppers down your throat for this crime
 2021-02-25 20:35:08 -06:00
Lin bc8b253837 Merge pull request #14303 from DeltaFire15/wiring-skillgain 
Adds state check callbacks to machine frame tool use
 2021-02-25 18:03:00 -06:00
silicons 504a36f50d Update holy_weapons.dm 2021-02-24 01:36:03 -07:00
DeltaFire 60708b03df check 2021-02-24 05:16:15 +01:00
SandPoot 6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
Letter N 5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08: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
Letter N 2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
silicons 841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
Letter N 7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N 0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
silicons 030f8ad681 Merge pull request #14261 from SmArtKar/tcg_qol 
[READY] Small QoL changes to TCG
 2021-02-19 13:37:10 -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
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08: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
SmArtKar 756be084bc Decks are saveable! 2021-02-17 18:50:23 +03: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
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08: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
timothyteakettle 8f0fbb75ac Update security.dm 2021-02-14 22:21:11 +00:00
Letter N 78ef87b012 minor fixes, compile but still bugged 2021-02-14 17:08:16 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Hatterhat c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08: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
Letter N 5db87b9065 more updates! 2021-02-12 17:52:59 +08:00