cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,197 Commits 5 Branches 0 Tags
6d51b51abb6be4aadab9247d38b2ea517f11bb12
Commit Graph

20437 Commits

Author SHA1 Message Date
Nadyr
e2ff2b55c2 Merge pull request #5658 from CHOMPStation2/upstream-merge-14430 
[MIRROR] [MIRROR] Removes unused mecha damage absorbtion list.
 2023-02-07 16:40:22 -05:00
Nadyr
487e74d9b7 powder that makes you say yes 2023-02-07 13:35:17 -05:00
Nadyr
13b7a0abf8 powder that makes you say yes 2023-02-07 13:33:32 -05:00
Nadyr
40322e3b47 Merge pull request #5651 from CHOMPStation2/upstream-merge-14423 
[MIRROR] Add required components to circuit board examine text
 2023-02-07 13:27:16 -05:00
Heroman3003
a5c34244ed Merge pull request #14447 from VOREStation/upstream-merge-8929 
[MIRROR] Fixes powersink having no sprite
 2023-02-06 06:57:26 +00:00
Heroman3003
6a2521f8c6 [MIRROR] Removes unused mecha damage absorbtion list. 2023-02-04 21:49:11 +00:00
Heroman3003
450842aaec Merge pull request #14428 from VOREStation/upstream-merge-8915 
[MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
 2023-02-04 20:58:26 +00:00
Heroman3003
7801d8845f Merge pull request #14423 from TheGreatKitsune/circuit_board_examine 
Add required components to circuit board examine text
 2023-02-04 20:36:40 +00:00
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
0e4960fc88 Merge pull request #5619 from CHOMPStation2/upstream-merge-14384 
[MIRROR] Adds ability to customize discomfort
 2023-02-02 20:45:58 -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
Heroman3003
515e92e594 Adds ability to customize discomfort 2023-01-28 22:12:59 +00:00
Nadyr
bd1f389bc4 Merge pull request #5613 from CHOMPStation2/upstream-merge-14387 
[MIRROR] [MIRROR] Simple animal flavour text will now show instead of desc, if set.
 2023-01-27 10:46:12 -05: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
110e73e70a Merge pull request #5549 from CHOMPStation2/upstream-merge-14332 
[MIRROR] [MIRROR] Blobs do damage to mechs
 2023-01-27 09:20:56 -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
Heroman3003
5ea98d068d Merge pull request #14387 from VOREStation/upstream-merge-8894 
[MIRROR] Simple animal flavour text will now show instead of desc, if set.
 2023-01-27 09:14:54 +00: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
9637bc980d Update suit_storage_unit_vr.dm 2023-01-21 22:27:38 -07:00
Razgriz
3759939290 Update assistant_vr.dm 2023-01-21 22:27:11 -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
c9037956e9 Merge pull request #14332 from VOREStation/upstream-merge-8868 
[MIRROR] Blobs do damage to mechs
 2023-01-16 08:45:10 +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
Casey
8658910087 fixes RP seasonal subtypes and adds seasonal water 2023-01-08 20:37:51 +00:00