Commit Graph

20327 Commits

Author SHA1 Message Date
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Verkister
cc7dfa2995 Fixes a funky sound bug revealed by emote PR
Apparently the sound system was straight up not even applying provided frequency if a sound proc didn't come with random pitch enabled.
2022-12-12 21:53:37 +02:00
Razgriz
f2338a49a2 Merge pull request #5290 from CHOMPStation2/upstream-merge-14096
[MIRROR] Trash pile adjustments
2022-12-11 19:48:58 -07:00
Razgriz
ec363507dc Merge pull request #5375 from TheGreatKitsune/Reforming
Reforming
2022-12-11 19:36:32 -07:00
Razgriz
034e6bd7b3 powder that rejects your reality and substitutes our own 2022-12-11 19:17:42 -07:00
TheGreatKitsune
c4ca4bbaed Merge master into reforming. 2022-12-10 14:53:38 -06:00
TheGreatKitsune
926f7d1e63 Fix remaining reforming bugs 2022-12-10 14:49:30 -06:00
Heroman3003
6f890fbe98 Merge pull request #14178 from Poojawa/fancy-AFGs
Fixes #14118
2022-12-10 00:22:48 +00:00
Nadyr
20fdc12788 Merge pull request #5335 from CHOMPStation2/upstream-merge-14164
[MIRROR] [MIRROR] Cleanable robo remains
2022-12-03 21:15:02 -05:00
Heroman3003
11ee3ee08e Merge pull request #14164 from VOREStation/upstream-merge-8852
[MIRROR] Cleanable robo remains
2022-12-03 20:12:44 +00:00
Nadyr
3db042cffe powder that makes you say yes 2022-12-02 20:54:02 -05:00
Nadyr
0b5c3ff9e1 Merge branch 'master' into upstream-merge-14148 2022-12-02 20:46:08 -05:00
Nadyr
81a125bc95 Merge pull request #5321 from CHOMPStation2/upstream-merge-14136
[MIRROR] Adds more altevian things
2022-12-02 20:37:51 -05:00
Casey
47d8000b2d Further Hacktool Adjustments 2022-11-27 18:02:23 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving
Adds more altevian things
2022-11-26 22:41:43 +00:00
Casey
7c84514c61 Merge pull request #14137 from KillianKirilenko/kk-hacktool
Simplified Hacktool
2022-11-26 22:41:34 +00:00
Nadyr
71faa610e0 Merge pull request #5300 from CHOMPStation2/upstream-merge-14133
[MIRROR] Ticket printer in belt
2022-11-21 23:44:27 -05:00
Casey
82951868f6 Merge pull request #14133 from Very-Soft/SecurityTickettweak
Ticket printer in belt
2022-11-22 01:56:07 +00:00
Casey
b461e2fd06 Ticket Printer! 2022-11-21 06:42:48 +00:00
Heroman3003
2e7c58bfa8 Merge pull request #14096 from Novacat/nova-basicfixes
Trash pile adjustments
2022-11-21 04:34:16 +00:00
Casey
191657472b Merge pull request #14066 from Heroman3003/sofix
Hopefully fixes corner sofas
2022-11-13 20:47:59 +00:00
Casey
9eb97c9b21 Merge pull request #14070 from foopwo/moooooo
Adds 'Rancher' alt title for botanist.
2022-11-11 22:02:31 +00:00
Nadyr
d916627637 Merge pull request #5238 from CHOMPStation2/upstream-merge-14048
[MIRROR] Fix bump teleporter
2022-11-07 17:35:58 -05:00
Casey
9922942a73 Merge pull request #14048 from Very-Soft/fixbumptele
Fix bump teleporter
2022-11-06 21:49:52 +00:00
Casey
18e8135f8e Merge pull request #14033 from Heroman3003/axe-the-axe
Axes the axes
2022-11-06 17:12:35 +00:00
Verkister
3eb0e7a6e8 Adds updated OOC link into the recipe book
Might as well put that thing in the kitchen into some kind of relevant use.
2022-10-30 17:09:15 +02:00
Nadyr
1faa74fbef Merge pull request #5200 from CHOMPStation2/upstream-merge-13934
[MIRROR] [MIRROR] Flavour Enhancement: Holidays
2022-10-29 19:14:19 -04:00
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role
Non crew role added
2022-10-29 19:08:16 -04:00
Nadyr
f9c63a2c86 Merge pull request #5203 from CHOMPStation2/upstream-merge-13999
[MIRROR] [MIRROR] Adds flasks to the forensic belt allowed items
2022-10-29 19:07:17 -04:00
Nadyr
c8f2ac43cd powder that makes you say yes 2022-10-29 18:58:45 -04:00
Heroman3003
2b434705c9 Merge pull request #13999 from VOREStation/upstream-merge-8799
[MIRROR] Adds flasks to the forensic belt allowed items
2022-10-29 07:41:25 +00:00
Heroman3003
4a38648ead Merge pull request #13974 from TheDavestDave/cargo-update
lets cargo order a pair of great tits
2022-10-29 07:38:10 +00:00
Heroman3003
b2731b3818 [MIRROR] Flavour Enhancement: Holidays 2022-10-29 07:28:49 +00:00
Verkister
5b0b68abd8 Fix fancy drink runtime 2022-10-27 18:39:33 +03:00
Nadyr
fc52bef699 Merge pull request #4796 from tacoguy7765093/VRfix-it-JUST-works
Adds a VR room and a functioning VR map for all your sandbox needs.
2022-10-24 17:13:51 -04:00
Casey
189f0dd88a Merge pull request #13941 from BonniePandora/Belts-&-Bindings-excite-me
CE & Detective belts tweak
2022-10-23 18:50:58 +00:00
Nadyr
60c6d78cca Merge pull request #5152 from CHOMPStation2/upstream-merge-13924
[MIRROR] [MIRROR] speculative fix for obj/random's not being deleted
2022-10-19 17:15:39 -04:00
Nadyr
bc7ece8d95 Merge pull request #5147 from CHOMPStation2/upstream-merge-13916
[MIRROR] [MIRROR] Fixes overlooked invisible spawner when mapping
2022-10-19 17:13:24 -04:00
Nadyr
ed42e3349a Merge pull request #5139 from CHOMPStation2/upstream-merge-13895
[MIRROR] Random-Soap Addon
2022-10-19 17:10:37 -04:00
Nadyr
7c65d53d53 Merge pull request #5138 from CHOMPStation2/upstream-merge-13898
[MIRROR] talon, vb, and typhon fixes
2022-10-19 16:55:54 -04:00
Casey
f5a847464c Merge pull request #13924 from VOREStation/upstream-merge-8752
[MIRROR] speculative fix for obj/random's not being deleted
2022-10-16 21:10:01 +00:00
Casey
aaef0c5556 Merge pull request #13916 from VOREStation/upstream-merge-8751
[MIRROR] Fixes overlooked invisible spawner when mapping
2022-10-16 21:07:35 +00:00
Casey
1d3e58a5a9 Merge pull request #13895 from KillianKirilenko/kk-randomsoap
Random-Soap Addon
2022-10-16 21:02:50 +00:00
Casey
bd67968cb8 talon, vb, and typhon fixes 2022-10-16 21:02:45 +00:00
Casey
2dab6d08d8 Merge pull request #13892 from KillianKirilenko/kk-paicharge
Update rechargestation.dm
2022-10-16 21:01:31 +00:00
Razgriz
81da61dd70 Merge pull request #5134 from CHOMPStation2/BlackMajor-patch-2
Fixes some small transit bug.
2022-10-15 23:13:16 -07:00
BlackMajor
24c64ae0a6 Fixes 2022-10-16 11:33:57 +13:00
Nadyr
7df5e6e4cb Merge pull request #5113 from CHOMPStation2/upstream-merge-13867
[MIRROR] [MIRROR] A -ton of Flags [READY FOR MERGE]
2022-10-11 20:43:55 -04:00
Nadyr
319b20c2ee Merge pull request #5119 from CHOMPStation2/upstream-merge-13881
[MIRROR] [MIRROR] Ports Diagonal Movement [READY FOR MERGE]
2022-10-11 20:40:10 -04:00
Nadyr
dc0115955a Merge pull request #5117 from CHOMPStation2/upstream-merge-13868
[MIRROR] [MIRROR] Rub A Dub Dub [READY FOR MERGE]
2022-10-11 20:37:18 -04:00