cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,078 Commits 9 Branches 0 Tags
b2912331b51f4d0b05fabe7944d7be2ace29dbba
Commit Graph

10533 Commits

Author SHA1 Message Date
Heroman3003
cbda0ff446 Merge pull request #14414 from Runa-Dacino/NIFrepairtoolfix 
Fixes NIF repair tool using up nanopaste when full
 2023-02-03 18:38:35 +00:00
Nadyr
708232d677 Merge pull request #5623 from CHOMPStation2/upstream-merge-14402 
[MIRROR] [MIRROR] Tiny grammar tweaks
 2023-02-02 20:50:59 -05:00
Nadyr
2ec2ff9e42 Merge pull request #5631 from CHOMPStation2/upstream-merge-14411 
[MIRROR] Fixes #14409
 2023-02-02 20:37:33 -05:00
Nadyr
0093bbac01 Merge pull request #5555 from lbnesquik/kot-muffle-item 
Add a mode to muffle items.
 2023-02-02 20:35:44 -05:00
Novacat
e34a990b3c Merge pull request #14411 from Cyantime/patch-2 
Fixes #14409
 2023-02-01 01:53:56 +00:00
Heroman3003
077834dd5c [MIRROR] Tiny grammar tweaks 2023-01-30 08:51:26 +00:00
lbnesquik
fc5996977c Add comments 2023-01-29 19:39:13 +01:00
Nadyr
527fc4dacc Merge pull request #5595 from CHOMPStation2/upstream-merge-14368 
[MIRROR] Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly
 2023-01-27 10:30:21 -05:00
Nadyr
57ae8c01ee Merge pull request #5564 from CHOMPStation2/upstream-merge-14336 
[MIRROR] [MIRROR] Repairing light robotic damage messaging fix
 2023-01-27 10:11:46 -05:00
Nadyr
55034ed973 Merge pull request #5588 from CHOMPStation2/upstream-merge-14353 
[MIRROR] Tilted Duffles
 2023-01-27 10:11:16 -05:00
Nadyr
7d25e70249 Merge branch 'master' into upstream-merge-14336 2023-01-27 09:43:44 -05:00
Nadyr
ca5ee82b75 Merge pull request #5559 from CHOMPStation2/upstream-merge-14344 
[MIRROR] better persistent dirt
 2023-01-27 09:32:25 -05:00
Nadyr
05407f585a Merge pull request #5551 from CHOMPStation2/upstream-merge-14330 
[MIRROR] Uplink and Pouch Tweaks
 2023-01-27 09:27:06 -05:00
Nadyr
f08f632ed4 Merge pull request #5539 from CHOMPStation2/upstream-merge-14327 
[MIRROR] Makes all carpet types orderable and gives them tile icons
 2023-01-27 09:16:47 -05:00
Nadyr
c7e4426a88 powder that makes you say yes 2023-01-27 08:59:21 -05:00
Nadyr
ce193717de powder that makes you say yes 2023-01-27 08:44:50 -05:00
BlackMajor
353f4e1cab Merge branch 'master' into upstream-merge-14247 2023-01-25 14:01:30 +13:00
Razgriz
376b3e8906 powder that makes you say yes 2023-01-24 17:53:21 -07:00
Casey
e5a0753e45 Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 18:37:22 +00:00
Razgriz
33f82fd5ac Update radio.dm 2023-01-21 22:28:49 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
ddd078fdca Merge pull request #14353 from KillianKirilenko/kk-duffs 
Tilted Duffles
 2023-01-22 01:34:01 +00:00
Razgriz
e67f4504dc Merge branch 'master' into upstream-merge-14344 2023-01-19 14:42:57 -07:00
Heroman3003
092c7025fd [MIRROR] Repairing light robotic damage messaging fix 2023-01-19 03:20:58 +00:00
Heroman3003
30c9c0517c Merge pull request #14344 from Seris02/emissiveborgs 
better persistent dirt
 2023-01-19 02:33:01 +00:00
lbnesquik
ff68eaaffd Fix it in a bad way. 2023-01-18 03:52:33 +01:00
lbnesquik
141519b826 Add a mode to muffle items. 2023-01-18 03:27:00 +01:00
Heroman3003
08935eea03 Merge pull request #14330 from Novacat/nova-basicfixes 
Uplink and Pouch Tweaks
 2023-01-16 08:45:22 +00:00
Heroman3003
fa1f8bb5b4 Makes all carpet types orderable and gives them tile icons 2023-01-13 22:00:36 +00:00
Verkister
c921b14c36 Update misc.dm 2023-01-11 11:44:26 +02:00
Verkister
604af27af9 also fixes that damn replicant window runtime rarr 
that line 183 above represents the feel of this shit messing up test runs and shit
 2023-01-11 08:13:39 +02:00
Verkister
9f7ff4e0ca A couple dirt fixes 
Fixes all cleanable decals (such as graffiti and such) creatign a huge pile of dirt onto the turf when spawned.
Also fixes decal dirt staying as a persistable decal after spawning despite its coded behavior being supposed to just dirty the turf into a regular dirt overlay.
 2023-01-11 07:56:51 +02:00
Nadyr
6a537e3c0f Merge branch 'master' into upstream-merge-14294 2023-01-04 21:46:39 -05:00
Nadyr
d53b043ea7 Merge pull request #5508 from CHOMPStation2/upstream-merge-14301 
[MIRROR] Fixes personal lockers robbing borgs of their modules
 2023-01-04 21:17:36 -05:00
Nadyr
5a72c83bff Merge pull request #5507 from Verkister/patch-30 
Makes capture crystals small
 2023-01-04 21:16:41 -05:00
Nadyr
265cf3c967 Merge branch 'master' into upstream-merge-14294 2023-01-04 21:09:02 -05:00
Nadyr
29e4d351d2 Merge pull request #5486 from CHOMPStation2/upstream-merge-14278 
[MIRROR] Fixes two admin bugs
 2023-01-04 20:46:49 -05:00
Nadyr
00edc849b5 Merge pull request #5479 from CHOMPStation2/upstream-merge-14269 
[MIRROR] Adjusts events and refactors borgs a bit in process
 2023-01-04 20:45:00 -05:00
Nadyr
5a5fa0a23d Merge pull request #5482 from CHOMPStation2/upstream-merge-14271 
[MIRROR] Miscallaneous Tweaks
 2023-01-04 20:36:41 -05:00
Nadyr
b7ef4171c8 Merge pull request #5475 from CHOMPStation2/upstream-merge-14262 
[MIRROR] Maint pred cancel tweak
 2023-01-04 20:34:36 -05:00
Nadyr
bfce473f7a Merge pull request #5480 from CHOMPStation2/upstream-merge-14264 
[MIRROR] Fixes comfy chair colors
 2023-01-04 20:21:08 -05:00
Nadyr
7429a71bcb powder that makes you say yes 2023-01-04 20:12:26 -05:00
Nadyr
af5693053b Merge pull request #5473 from CHOMPStation2/upstream-merge-14260 
[MIRROR] Fixes autolathe, material and smartfridge issues
 2023-01-04 18:57:38 -05:00
Novacat
b1c7a73918 Merge pull request #14301 from Heroman3003/borgfix2 
Fixes personal lockers robbing borgs of their modules
 2023-01-04 13:40:35 +00:00
Verkister
1347e6bdb6 Makes capture crystals small 
It's supposed to be a pokeball, not bakpakball.
 2023-01-04 11:17:36 +02:00
Casey
63c49c4e90 Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event 2023-01-03 21:56:23 +00:00
Novacat
52768f5185 Merge pull request #14278 from Heroman3003/admin-ooc-fix 
Fixes two admin bugs
 2022-12-31 05:01:14 +00:00
Heroman3003
c26d10f224 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-30 21:06:28 +00:00
Heroman3003
e270d35320 Merge pull request #14264 from Heroman3003/chaircolors 
Fixes comfy chair colors
 2022-12-30 21:05:16 +00:00