Commit Graph

10562 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
Nadyr
8f2312988b Merge pull request #5807 from CHOMPStation2/upstream-merge-14566
[MIRROR] Makes SD wall lockers properly visible
2023-02-27 02:17:07 -05:00
Nadyr
34208c191b Merge pull request #5785 from CHOMPStation2/upstream-merge-14547
[MIRROR] Ghost pod for debris POI moved into its own separate PR
2023-02-27 02:08:18 -05:00
Casey
594ec63a8b Makes SD wall lockers properly visible 2023-02-26 18:10:04 +00:00
Seris02
c121d589c8 resolve it 2023-02-26 18:21:49 +08: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
cef0668717 Merge pull request #5793 from CHOMPStation2/upstream-merge-14554
[MIRROR] [MIRROR] Safes Move Objects In Late Initialize.
2023-02-26 01:02:42 -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
ab8361b3f3 Merge pull request #14554 from VOREStation/upstream-merge-8981
[MIRROR] Safes Move Objects In Late Initialize.
2023-02-26 00:52:29 +00:00
Heroman3003
916526893a Merge pull request #14547 from Runa-Dacino/SurvivorPod
Ghost pod for debris POI moved into its own separate PR
2023-02-25 03:04:16 +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
Razgriz
3a756672b6 Merge pull request #5755 from CHOMPStation2/upstream-merge-14481
[MIRROR] Adds new machine that mass-produces autoinjectors
2023-02-20 16:02:38 -07:00
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Casey
b82736dc53 Merge pull request #14504 from Very-Soft/misc_fixes
Misc fixes
2023-02-17 19:32:51 +00:00
Razgriz
92d9cc3724 Add ticket printer to warden locker 2023-02-15 16:29:04 -07:00
Razgriz
492eb58400 Add ticket printer to HoS locker 2023-02-15 16:28:18 -07:00
Razgriz
fa3c94ace6 Add ticket printer to security locker 2023-02-15 16:27:09 -07:00
Razgriz
3420ef604e Merge pull request #5721 from CHOMPStation2/Razgriz1032-patch-7
This is what we call a difficulty tweak
2023-02-14 14:47:09 -07:00
Razgriz
6d9cbfb0f8 MORE SPIDERS 2023-02-13 23:10:47 -07: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
Razgriz
eb0909a6fb Update HoS lockers 2nd deck 2023-02-12 17:28:05 -07: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
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