cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-08 07:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,631 Commits 10 Branches 0 Tags
57d1f703be41901118bb3bcb100b247cd79bde87
Commit Graph

6499 Commits

Author SHA1 Message Date
Razgriz
ada3e13709 Make ticket printer smaller 
Because something so small, trivial, and used for silly RP should not be practically gigantic.
 2023-02-27 16:54:21 -07:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Razgriz
3b0f59cea1 Merge pull request #5794 from CHOMPStation2/upstream-merge-14533 
[MIRROR] [MIRROR] Suit kits no longer set item_state on hooded clothes
 2023-02-26 01:02:56 -07:00
Razgriz
89440c6d2e Merge pull request #5779 from CHOMPStation2/upstream-merge-14534 
[MIRROR] Adjusts artistic crate orders
 2023-02-26 00:56:08 -07:00
Heroman3003
558d6e2431 Merge pull request #14533 from VOREStation/upstream-merge-8965 
[MIRROR] Suit kits no longer set item_state on hooded clothes
 2023-02-26 00:58:49 +00:00
Heroman3003
993acbf556 Merge pull request #14534 from Heroman3003/art-paint-stuff 
Adjusts artistic crate orders
 2023-02-25 03:01:42 +00:00
Heroman3003
b34a6da9bd Merge pull request #14497 from Seris02/capcrystalunleashfix 
cap crystal ooc escape fix
 2023-02-22 08:50:32 +00:00
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Razgriz
574e463b5d comments that make you say yes 2023-02-13 22:04:59 -07:00
Sharkmare
77a073ac71 Fxiing taperecorder voices 
Carbon/Human has a voice variable for voicechangers and to not go unknown when face is covered without ID, taperecorder now respects that
 2023-02-14 02:13:27 +01: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
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
0093bbac01 Merge pull request #5555 from lbnesquik/kot-muffle-item 
Add a mode to muffle items.
 2023-02-02 20:35:44 -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
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
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
Heroman3003
092c7025fd [MIRROR] Repairing light robotic damage messaging fix 2023-01-19 03:20:58 +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
Nadyr
5a72c83bff Merge pull request #5507 from Verkister/patch-30 
Makes capture crystals small
 2023-01-04 21:16:41 -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
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
Verkister
1347e6bdb6 Makes capture crystals small 
It's supposed to be a pokeball, not bakpakball.
 2023-01-04 11:17:36 +02:00
Heroman3003
c26d10f224 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-30 21:06:28 +00:00
Heroman3003
21b9d0e636 Adjusts events and refactors borgs a bit in process 2022-12-30 21:05:11 +00:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Heroman3003
6b5a73d2da Merge pull request #14257 from Heroman3003/varios-fixes 
Various minor fixes
 2022-12-28 05:02:08 +00:00
Razgriz
bc832e34b9 Merge pull request #5445 from CHOMPStation2/upstream-merge-14238 
[MIRROR] Fixes a pair of runtimes
 2022-12-26 12:28:24 -07:00
Razgriz
14830c8729 Merge pull request #5443 from CHOMPStation2/upstream-merge-14235 
[MIRROR] Fixes critical inventory equipment bug
 2022-12-26 12:27:42 -07:00
Razgriz
af1fe8d2ab Merge pull request #5434 from CHOMPStation2/upstream-merge-14216 
[MIRROR] ticket printers and folders are now holsterable
 2022-12-26 12:20:43 -07:00
Razgriz
f1b3873f5e Merge pull request #5426 from Verkister/eggynames 
Adds custom egg name option for vorgan egg mode
 2022-12-26 12:17:46 -07:00
Casey
b1307d3896 Merge pull request #14238 from Heroman3003/langfix 
Fixes a pair of runtimes
 2022-12-24 08:35:07 +00:00
Casey
ece7dbb2f2 Merge pull request #14235 from Heroman3003/inventory-fix 
Fixes critical inventory equipment bug
 2022-12-24 06:25:59 +00:00
Casey
d21fd301a0 Merge pull request #14216 from TankTheBirb/holster-stuff 
ticket printers and folders are now holsterable
 2022-12-23 16:24:01 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
BlackMajor
362f539e12 Chrimbus Tree 2022-12-23 20:40:37 +13:00