shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,602 Commits 5 Branches 0 Tags
9217fcc7dc919ab080fa2a8dab113dfcbe73a1eb
Commit Graph

47602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
9217fcc7dc Merge pull request #16043 from SandPoot/stacks 
Make stacks show how much there are in inventory
 2023-12-29 22:57:38 -05:00
SandPoot
272879367f solution for numerical display bags 2023-12-30 00:31:57 -03:00
deathride58
c95f60c37b Merge pull request #16034 from BlueWildrose/TransRightsAreHumanRights 
Adds decal patterns to LGBT holidays + Pansexual and Panromantic Awareness Day holiday
 2023-12-29 22:05:37 -05:00
deathride58
15e1858862 Merge pull request #16045 from Putnam3145/eggnog-fix 
Adds non-alcoholic eggnog
 2023-12-29 22:04:59 -05:00
deathride58
6eb776599f Merge pull request #16046 from SandPoot/item-on-item-behavior 
Disables items hitting items, makes noise and feels wrong.
 2023-12-29 22:04:36 -05:00
SandPoot
6733de69bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks 2023-12-29 23:16:11 -03:00
SandPoot
2ab6c62ee6 prevent hit 2023-12-29 23:07:24 -03:00
deathride58
ce1d757159 Merge pull request #16016 from SandPoot/throwing-update 
[TESTMERGE] Updates firemanning, throwing stuff
 2023-12-28 22:44:59 -05:00
SandPoot
2585c545fa not necessary 2023-12-28 00:37:23 -03:00
Putnam3145
4ded956613 actually it's 33% rum why is it not 33% the power 2023-12-23 14:57:34 -08:00
Putnam3145
78982c2e6f typos and other such issues 2023-12-23 14:49:46 -08:00
Putnam3145
e65f386de9 Makes eggnog not alcoholic 2023-12-23 14:22:58 -08:00
deathride58
6302e00a9b Merge pull request #16044 from SandPoot/ai-+-mech 
Makes AIs deconstructable
 2023-12-23 02:47:49 -05:00
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot
0ba01a977d repath on maps 2023-12-17 23:53:03 -03:00
SandPoot
de3c8435b5 thanks for saying it was a brain, you guys are the best 2023-12-17 23:43:54 -03:00
SandPoot
653b767f32 remove antags for borging... 2023-12-17 23:35:51 -03:00
SandPoot
27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
SandPoot
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot
7533d51ae4 is_cyborg 2023-12-13 13:07:10 -03:00
SandPoot
35723b9bd7 field access... 2023-12-13 12:55:33 -03:00
SandPoot
606ffd5b1e just get rid of these issues already 2023-12-13 12:52:50 -03:00
SandPoot
c182a337fe poosh 2023-12-13 00:24:57 -03:00
SandPoot
f626df9d1d push 2023-12-13 00:08:58 -03:00
deathride58
3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs 
Deals with lava plus a lot of borg stuff
 2023-12-12 19:25:13 -05:00
deathride58
4baea8119d Merge pull request #16041 from SandPoot/fixing-chat-saving 
Fixes chat log saving breaking because of unsupported CSS rules
 2023-12-12 19:22:58 -05:00
deathride58
4e39bef762 Merge pull request #16040 from SandPoot/better-countdown-effect 
Makes countdown objects follow their targets better
 2023-12-12 19:21:51 -05:00
deathride58
e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable) 
Maptext()s the maptexts
 2023-12-12 19:21:17 -05:00
SandPoot
06b45aa140 push 2023-12-12 15:04:38 -03:00
SandPoot
f95f776547 push 2023-12-11 18:30:19 -03:00
SandPoot
e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot
c1ec13b1bf maybe final 2023-12-07 23:55:44 -03:00
SandPoot
00adad96ff c 2023-12-07 23:39:19 -03:00
SandPoot
0d8739aebf b 2023-12-07 23:37:04 -03:00
SandPoot
d2039c33fe a 2023-12-07 23:24:08 -03:00
SandPoot
c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
deathride58
a91e0990a2 Merge pull request #16037 from SandPoot/fontawesome 
Bumps up FontAwesome to 6.1.2
 2023-12-06 14:58:31 -05:00
SandPoot
f698cbb8a7 bump 2023-12-01 14:54:05 -03:00
BlueWildrose
9d8b2bc8cb Merge pull request #16035 from SandPoot/tags 
Adds Datum Tagging for admins
 2023-11-27 20:06:28 -07:00
SandPoot
b290efc434 push 2023-11-22 14:11:17 -03:00
silicons
9f7685d65c Merge pull request #16028 from DeltaFire15/powernet-optim 
Minor power_change optimization (updated)
 2023-11-17 12:25:47 -08:00
BlueWildrose
8d6801c387 holiday patterns + pansexual/panromantic holiday 2023-11-16 16:34:10 -07:00
BlueWildrose
8e72f5e7c4 code for patterns 2023-11-16 16:32:48 -07:00
BlueWildrose
177b59b28a LGBT color defines 2023-11-16 16:30:21 -07:00
SandPoot
b771da06ac Merge pull request #16033 from DeltaFire15/oops 
Oops
 2023-11-13 14:29:34 -03:00
DeltaFire
398d892fb0 oops 2023-11-13 15:43:16 +01:00
dependabot[bot]
f68955e954 Bump path-parse from 1.0.6 to 1.0.7 in /tgui (#16032) 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:55:03 +01:00
dependabot[bot]
03e3f60bb3 Bump tar from 6.1.8 to 6.2.0 in /tgui (#16031) 
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.8 to 6.2.0.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.8...v6.2.0)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:46:18 +01:00
dependabot[bot]
933623db9b Bump word-wrap from 1.2.3 to 1.2.5 in /tgui (#16030) 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:38:16 +01:00
dependabot[bot]
92af54a999 Bump semver from 6.3.0 to 6.3.1 in /tgui (#16029) 
Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-13 13:38:11 +01:00