shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,121 Commits 5 Branches 0 Tags
af540ba4eff2daadf855ae2e66ce3d565bf4ec97
Commit Graph

4297 Commits

Author SHA1 Message Date
silicons
a1c4323653 Merge pull request #14457 from GrayRachnid/holopads 
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
 2021-03-20 14:28:07 -06:00
silicons
1f58e1823e Update bodybag.dm 2021-03-18 17:00:16 -07:00
silicons
8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal 
Locks Bluespace Jars to be admin-only
 2021-03-18 06:41:38 -06:00
GrayRachnid
b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04:00
DeltaFire
45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints 
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
 2021-03-17 17:01:47 +01:00
DeltaFire
2d43fd06e8 qdel 2021-03-15 23:14:29 +01:00
DeltaFire
f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
silicons
5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5 
post-hardsync1.5
 2021-03-14 23:30:26 -06:00
Lin
521570793f Merge pull request #14392 from R3dtail/patch-4 
Readability/Grammar alteration
 2021-03-10 18:34:47 -06:00
Hatterhat
d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
silicons
18fdd0c6cf Merge pull request #14337 from kiwedespars/we-hate-cqc 
nerfs cqc (probably)
 2021-03-10 01:32:14 -07:00
Letter N
59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
R3dtail
25651e9144 Readability/Grammar alteration 2021-03-09 14:38:24 -06:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
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
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08: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
Letter N
c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
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
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
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
kiwedespars
081b669345 Merge branch 'master' into we-hate-cqc 2021-02-27 22:19:16 -08: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
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
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
kiwedespars
de69e9996a nerfs cqc 2021-02-21 13:10:08 -08:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08: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
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
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