cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,567 Commits 8 Branches 0 Tags
18795c6275bd41f27fa0d617ff1ea38868fa6821
Commit Graph

61567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sharkmare
18795c6275 should probably revert to non bsod on alive again 2021-02-12 11:26:32 +01:00
Sharkmare
85b80d6358 Tesh facemask ondeath event fix 2021-02-11 12:33:13 +01:00
Sharkmare
107f9efbeb Enabling Tesh Facemask 
I guess when i initially ported this from old chomp i forgot to enabled it in DME, woops
 2021-02-11 10:38:38 +01:00
Razgriz
26d1ac519a Merge pull request #1264 from CHOMPStation2/dependabot/npm_and_yarn/tgui/marked-2.0.0 
Bump marked from 1.1.1 to 2.0.0 in /tgui
 2021-02-08 17:56:15 -07:00
Razgriz
c721f9da2c Merge pull request #1266 from CHOMPStation2/revert-1249-RevertSize 
Revert "Revert #1240"
 2021-02-08 17:47:48 -07:00
Razgriz
5c7d335e2b Revert "Revert #1240" 2021-02-08 17:36:28 -07:00
dependabot[bot]
b280854e50 Bump marked from 1.1.1 to 2.0.0 in /tgui 
Bumps [marked](https://github.com/markedjs/marked) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v1.1.1...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-08 22:20:28 +00:00
Razgriz
f818fa1d8a Merge pull request #1258 from CHOMPStation2/Razgriz1032-patch-18 
Fix runtime
 2021-02-07 22:12:30 -07:00
Razgriz
303d89b3f8 Fix runtime 
DEBUG: Runtime in areas.dm,402: Cannot read null.len
 2021-02-07 22:03:16 -07:00
Razgriz
e1b3126391 Merge pull request #1250 from CHOMPStation2/RevertSize 
Revert #1238
 2021-02-07 17:46:53 -07:00
Razgriz
9760ad2b36 Revert #1238 
Revert #1238 SQL ReturnlessQuery()
 2021-02-07 17:34:25 -07:00
Razgriz
78f5bca355 Merge pull request #1249 from CHOMPStation2/RevertSize 
Revert #1240
 2021-02-07 17:01:13 -07:00
Razgriz
7313c4c3de Revert Size traits #1240 
#1240
 2021-02-07 16:50:01 -07:00
Razgriz
314cf6f99f Revert #1240 
Revert #1240
 2021-02-07 16:48:10 -07:00
Razgriz
eec37367a2 Merge pull request #1248 from CHOMPStation2/Loneliness-sanity-check 
Sanity check on loneliness traits
 2021-02-07 13:54:27 -07:00
cadyn
f3075eec21 wait istype should work more robustly here 2021-02-07 12:41:46 -08:00
cadyn
6818ee98df Sanity check on loneliness traits 
Just adding a sanity check to prevent some runtimes
 2021-02-07 12:40:00 -08:00
cadyn
76921a3c7c Merge pull request #1246 from cadyn/fixmemoryleak 
possibly fix recent OOMing
 2021-02-07 11:29:02 -08:00
Razgriz
c446790d4f Merge pull request #1234 from cadyn/ballistics-v4 
Ballistics v4
 2021-02-06 22:59:44 -07:00
Cadyn
1543d78f16 possibly fix memory leak 2021-02-06 21:37:26 -08:00
Razgriz
0869bf3824 Merge pull request #1244 from CHOMPStationBot/upstream-merge-9648 
[MIRROR] Neuters Ambers
 2021-02-06 18:11:09 -07:00
Razgriz
4fe8a93457 Merge pull request #1240 from CHOMPStationBot/upstream-merge-9646 
[MIRROR] Adds body shape traits and proper preview scaling
 2021-02-06 18:11:03 -07:00
Chompstation Bot
b9b5261dca Neuters Ambers 2021-02-07 00:28:57 +00:00
Novacat
af2a6c4baf Merge pull request #9648 from VOREStation/Verkister-patch-8 
Neuters Ambers
 2021-02-07 00:28:57 +00:00
Cadyn
59f9c43a6d Bugfix + Bolt-action sounds 2021-02-06 08:27:13 -08:00
cadyn
58e84bc354 Update neutral.dm 2021-02-06 07:26:46 -08:00
cadyn
5a6bb0d7c4 ohgodohfuck 2021-02-06 06:05:38 -08:00
Razgriz
9948e57a56 Merge pull request #1242 from CHOMPStation2/Razgriz1032-patch-15 
FIX WHITELIST AGAIN
 2021-02-06 00:59:46 -07:00
Razgriz
ced6985091 FIX WHITELIST AGAIN 
🆑
bugfix: Restores some mysteriously missing code...
/🆑

WHY THE FUCK DID THIS DISAPPEAR AND HOW??? I literally cannot find it in gitblame or history. It was originally implemented in #59
 2021-02-06 00:41:26 -07:00
Chompstation Bot
d1e1c62d1d Adds body shape traits and proper preview scaling 2021-02-05 21:09:43 +00:00
cadyn
373329e941 Merge pull request #1220 from CHOMPStationBot/upstream-merge-9623 
[MIRROR] Adds flushable toilets.
 2021-02-04 23:48:40 -08:00
cadyn
fb1e9503f5 Merge pull request #1239 from MisterGrimm/Precursorpewpew 
Replaces alien pistol projectile with its own special projectile, plus some minor tweaks.
 2021-02-04 23:34:12 -08:00
cadyn
4e0bd6470c Merge pull request #1238 from cadyn/sqlinsertquery 
Added and implemented ReturnlessQuery()
 2021-02-04 23:33:20 -08:00
Cadyn
5e9735fbac Touching up everything. 2021-02-04 23:31:13 -08:00
Sym
9b69e4ab34 Clean the addition 
Oh god I forgot to update the branch before I did all this stuff.
 2021-02-05 00:16:11 -05:00
Sym
4c7e6796c6 Add battery lock 
Makes it harder to BS void cells.
 2021-02-05 00:09:13 -05:00
Sym
da52aa33cc Updoot? 
Oh god what is it doing
 2021-02-05 00:02:34 -05:00
Sym
420a38a8c4 Balance 1.1, less damage 
Reduce from 55 to 48.
 2021-02-04 23:55:47 -05:00
cadyn
3bc058624e Merge branch 'master' into Precursorpewpew 2021-02-04 20:49:25 -08:00
Sym
2d641fed65 Adds Precursor Projectile for alien guns 
Replaces default cyan beam with new precursor beam, complete with new icon. Credit to Kassc for sprucing up the sprite.
 2021-02-04 23:15:51 -05:00
Cadyn
aee6b61ffb added and implemented ReturnlessQuery() 2021-02-04 17:58:40 -08:00
cadyn
a8375c9e79 Merge pull request #1236 from Kazzc/Chessholo 
Chess for Holodeck
 2021-02-04 16:37:48 -08:00
Kassc Zeravla
4e6e0fc345 Chess for Holodeck 
SC-8 CC: Added a new holodeck room to play chess
SC-2: Minor edits on the holodeck console so it can display chess holodeck
-Various visual improvements.
 2021-02-04 19:12:37 -05:00
Razgriz
8bf292d9c5 Merge pull request #1235 from Shadowfire117/ExtraMas 
quick fix
 2021-02-04 14:25:21 -07:00
Shadowfire
e0f0261727 quick fix 
spelling errors, bleh
 2021-02-04 21:30:10 +01:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
cadyn
6e569ca7de Merge pull request #1209 from MisterGrimm/GammaJamma 
Adds the GA-X Experimental Gamma Laser for mechs
 2021-02-03 13:16:02 -08:00
cadyn
92b4eb2fd8 Merge pull request #1200 from LuciusWorna/master 
Energy Weapons Rebalance and Misc Fixes
 2021-02-03 13:15:50 -08:00
Razgriz
e15b227727 Merge pull request #1231 from CHOMPStationBot/upstream-merge-9639 
[MIRROR] Fixes nontaur clipping
 2021-02-03 09:56:24 -07:00
Razgriz
de48720951 Merge pull request #1229 from CHOMPStation2/Razgriz1032-patch-14 
Added shield diffusers
 2021-02-03 09:55:42 -07:00